Adapt to new CLAST structure within upstream CLooG version and retain compatibility...