Don't rearrange #ifdef's because it is not esthetic. Flag it as cms::thread_safe instead