Code review: 187850043:  Clean up of old pylint syntax.