refactor ForControl and Field, discovering new places where VariableDeclarator is used
fixed typo