Fix grammar for tuples