Bug 839376 (part 4) - Fix four or five more rooting hazards.  r=sfink.

--HG--
extra : rebase_source : 4e4e844c48b5282b772845c87f56e2384cf68998