runtime: continue moving to new strongly-typed DSLl