Bug 1009645 - Address additional comments. r=bz

--HG--
extra : rebase_source : c6befdd143ad15751182af10f80b03c2f23eea4d