Proper syntax for generated singleton-lists
Replace N-tuples with 2-tuples