Bug 857988 linting follow up