(I realize the code in here didn't use it either, but while we're changing it, better to use the nicer helper)