Update to support StyleCop v4.7