CSP2: Really fixing sandbox ABNF.