I've got this change ready to check in. Turns out some tests used the directive directive, but those were easy enough to fix up. I'm not checking it in until I've heard from some more people, though (especially Jim). I got one "aye" from SteveA. This isn't a big deal either way, it's just the tidy side of my nature that wants to do this little simplification <grin>. --RDM