Added tracking for free variables within formulas.