I'd recommend moving from a custom DSL to CUE, but I am most certainly biased in this recommendation :]