Remove helpers and add them to dependencies.