MFC r261309Unbreak non-SMP builds. This was broken by r259284. Also, reorganize thecode introduced in that revision a bit.