Tidied up some of the shuffle stage instrumentation.