Fix imports to match our style.