Change from Vector context to Vector2D context

Also made the list of type 'OL' and removed unnecessary parentheses inside ANS( ) calls.