Bug 1083279 - Follow-up: address review comments. r=gbrown

Pushed without committing the changes addressing gbrown's review
comments.

--HG--
extra : rebase_source : 4df8be9befc251aa8652baa62da81d1637a6a86d