Stephen, I'm now in a place to check this work in. Do you have a current patch, or should I just start with the one posted? Do I need to check this in for you or can you do it? -benjamin