The attached diff file work against tcl 8.5.2.

Will form part of 8.7