r22542: Move over to using the _strict varients of the talloc