More import fixes.

For simplicity we'll need to soon revert to just dumping
everything in core.