Clean up some markup cruft.  A number of the macros that take no
parameters (like \UNIX) are commonly entered using an empty group to
separate the markup from a following inter-word space; this is not
needed when the next character is punctuation, or the markup is the
last thing in the enclosing group.  These cases were marked
inconsistently; the empty group is now *only* used when needed.
diff --git a/Doc/lib/tkinter.tex b/Doc/lib/tkinter.tex
index bdc48c5..d9c3646 100644
--- a/Doc/lib/tkinter.tex
+++ b/Doc/lib/tkinter.tex
@@ -39,7 +39,7 @@
 
 The \module{Tkinter} module (``Tk interface'') is the standard Python
 interface to the Tk GUI toolkit, now maintained at ActiveState.  Both
-Tk and \module{Tkinter} are available on most Unix platforms, as well
+Tk and \module{Tkinter} are available on most \UNIX{} platforms, as well
 as on Windows and Macintosh systems.
 
 \begin{seealso}
@@ -1674,7 +1674,7 @@
 \seetitle[http://www.wxwindows.org]{wxWindows}{
 is a GUI toolkit that combines the most attractive attributes of Qt,
 Tk, Motif, and GTK+ in one powerful and efficient package. It is
-implemented in \Cpp. wxWindows supports two flavors of Unix
+implemented in \Cpp. wxWindows supports two flavors of \UNIX{}
 implementation: GTK+ and Motif, and under Windows, it has a standard
 Microsoft Foundation Classes (MFC) appearance, because it uses Win32
 widgets.  There is a Python class wrapper, independent of Tkinter.