I'll take a look at this this evening. I managed to get the new patch to
segfault with bundles calling bundles that each used/set handles, but I'll
get it a little more worked out and get back to you.

- Bryce