Remove more pstring. Unify talloc_sub functions to make