Fix new eslint warnings

[rmunn]

After #1842, we'll want to fix the new eslint warnings rather than ignore them.