r18082: bring talloc in line with new conventions