The latter is pretty easy to vibe-patch in:

https://github.com/burke/helix/pull/1