Move the wait on "core stop" out of fetch, and into issue