Bug 879273 - linter fixes, r=Rik