Tweaks to cyclic dependency tracking
Renaming of variables