Cleaned up imports/(re-)exports a bit.