Agree, this was a last-minute hack. If you have an idea how to rethink this you can share one in a spec repo issues if you don't mind https://github.com/cooklang/spec. Thanks!