Adjust code in light of latest import destination path discussion.