SIP-18, schmip-18. Import cleanup, too.