Merge "cleanup: collect twopass variables"