Factor out some more dead code.