I think that would be a further improvement.
Will look into it.

The code is messy, fragile, and abandoned
by the originator, so it improves only in
tiny, tentative incremental changes, usually
motivated by actual bugs and crashes, not
just aesthetic concerns.

Someone who really got up a head of steam
to make it much much better would be better
off rewriting the thing from the ground up,
IMO.

That said, the memleak in the separator
handling from a VFS looks legit and
properly fixed.