Update isort to handle more complex cases of data types intermixed in importing