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