Original commit message from CVS: fix underquotedness of macros
Original commit message from CVS: more of the same