Improvements in HEK2VSO and HELIO modules

This is a re-make of #792 but without the `extern` module.