More refactorings for more .NET4.5