Refactored to make expectToken().
Added some beginnings of data type parsing.