clean up dirty __import__ code

Unless there's a good reason not to.