Fix semicolon and comma after t or T not moving caret after first match

Fixes #666