Minor tidy up to fix pop/peep in grammar, and make paritipation default in Delta