More changes for stricter pool pointers.