TD-3939 (Issues identified by ReSharper warnings)