Hadn't tested recent changes with multi-threaded. Shame on me.
Add CTXT as necessary.
Authored by: dwarren 2006-10-16
Parent: [r4995]
Child: [r4997]
