[DO NOT MERGE] some more code cleanup following the guillotine (bug 1073432)

Fixes [bug 1073432](https://bugzilla.mozilla.org/show_bug.cgi?id=1073432)