I don't think we need this extra function for the task at hand.
But let me look at it more closely during the weekend.