If anyone else wants to investigate and submit a patch to me, that would be fine, too (can you tell I'm busy?)