Tidy up imports.
Fixed: Raise doesn't return <None>.