Slightly different valgrind fix Allocate with calloc rather than conditionally memsetting a specific part of the struct later on.