Minor refactoring a la ReSharper