Slight fixes to scan/reduce/redomap internalisation...

...still not fully correct.  There is a deeper issue.
I will fix it some day.