tweaking the conditionals around multi-thread support