Fix updated underscore lint (#1701)

6 files changed