... thus I prepared the below. I tried to minimize the diagnostic 
changes but a few more testcases needed tweaking anyway.

Thanks!
Paolo.

///////////////////////