Use the new ctrl_alloc_with_free to clean up a long-standing FIXME in