Bug 917717 - Part 2: nits.