Fix daft bug creating 'pairs', also for -> foreach.