It's suitable here now that the code's been changed to use raw pointers, and I've updated this (and a few other places).