Added some macros to Tcl scripts, etc.