Remove the global step_multi in favour of a per-thread