Move wrapIfNotThreadSafe() to RunNotifier