@andronat , this is the critical change your are suspicious of leaking am I right? Because other than that I only see renaming of variables in the diffs.