Given that we are modifying a part of the code that deals with dynamic memory, I think it would be interesting to make a pass on valgrind suite before merging. Or maybe you have already done that?