Fix repeated 'and' and whitespace in Naiad.i7x