Finish debugging merge of helicity routines

The CI accidentally built on an older version, meaning we never finished the debugging on the helicity code. Let's do this now...