Replace make_null_shared_ptr, mutex and lock with their std:: counterparts