some more code cleanup following the guillotine (bug 1073432)