Instead of the booleans, you could just put the freeing inside the nested ifs in the proper place.

Sure, that's also possible. It was the original version I had implemented, which I found a bit difficult to read in combination with the nesting.

Edit: I'll update the diff.