Handle public imports MUCH more efficiently. Fixes #160