Multiple changes in order to get closer to suggestions by FxCop.