Well shit. Restructure it such that the returned list is always NULL- terminated with the same mechanism.