FYI,

I've checked this in.  Wacks a further two (C) problems (the file was 
moved to an insight directory).

committed to mainline and 6.2,
Andrew