More progress on importing when X isn't running.