Shall I see if I can devise a way to make it non-generic and move it to util-list.[ch]?