Additional fix in threading macros.