Bug 934916 - Part: fix linter failures.