I see the old code had that already. Still, worth reconsidering.