ThreadSafetyBuiltinObject tweaks