This patch works for me, and is about as simple as I could make it. If there are no complaints with the approach, I'll add/update tests and send a larger patch. So, does this look ok? -- Steve Borho