cosmetics: Move some more code around to avoid #ifdeffery.