SH: Consolidate NPTL/non versions of clone