Rework the script to work with the new helpers instead of everything else.