Thanks for the feedback! I've split the patch into the two halves and updated return values, etc. I'm not too familiar with the "Data" API, so I left things as-is for the time-being. If the second patch isn't right, hopefully the first is still useful. :) Thanks, -Kees