Bug 985369 - Follow-up, fix linter issues r=me