Charj: made SDAG grammar reflect actual SDAG implementation