Bring the source more into line with Tcl style.