8d1e5334ec
This was only really used in one place, so better to just do it there rather than requiring another argument for the handle calculation.