The 2 helpers are now identical.  Can we consolidate them to 1?