A little cleanup of dwca import framework.