Some rearrangements for the importdl.c restructuring.

This is part of a set of patches by Greg Stein.