Minor refactoring a la ReSharper - no warnings now