resolved longstanding issue, fleshing out DSL more