Bug 1084025, Part 3: Clean up some bits, r=keeler, r=emk

--HG--
extra : rebase_source : 7aa1de4e9c391bf3e3cd5df79c62fff4546a8c67