Fixes to high-level macros after previous changes
Fixes to high-level macros after previous changes

Fix thread_exit in high-level macro

mercury-hpc/mercury,mercury-hpc/mercury,mercury-hpc/mercury,mercury-hpc/mercury