Prepping tasks to play nice

Cleaning up messes/inconsistencies in the other Helium-related functions
before moving on to HeTalk.