>> #1, #4, and #5 are all fine. >> >> I think #3 is fine, too, but someone who knows more about that code than I >> do should have a look, too. >> >> I suspect #2 is fine, as well, but Pavel may want to weigh in. > > > 2 looks fine, 3 looks fine in principle :) > Pavel Thanks for reviewing, all committed. Yuriy