Rework into Tcl 8.5+ coding style.