Cleaning up style cop and code analysis errors.