Re-check-in of code update after re-Sharper code review