Use the new helper.  Also untangle the error path, and in so doing
noticed that estimator generator failure would lead to us leaking an
ID.  Fix that bug.
Signed-off-by: Matthew Wilcox <mawilcox@microsoft.com>