Second and final part of stricter StyleCop settings.