Line strings now in tokens, for better error reporting