Removed redundant VarTypePair def, fixed adding func args to scope