clear up conflicting shadow-imports.