Instead of passing around a tuple, use a class. Rename untokenized tokens to 'words' while we're at it.