This looks like more than one patch to me. Much of the functional changes are obscured by the formatting fix. Perhaps it would be better to fix the formatting in one patch then make the rest of the changes? Adding the argument to SINGLE_THREAD_P and hoisting the cmp is a standalone change. Cheers /Marcus