+str #15736 Extended DslConsistencySpec, minor cleanups