- The lineNumber of token::undefinedToken was being changed instead of
  just the lineNumber of the return token.

- use List::first() and List::last() methods as well