Handle all import cases.

This handles the 'from' imports first and then the 'normal' imports. It
does this because it wants to catch cases where both from and normal
imports are specified. So it does one and then the other.

Fix bad merging.