Code cleanup from XALANJ-2236 (from Dave Brosius)
8 files changed