Fix free-variable finder