Bug 833385 - more review fixes.

Doesn't build.