Improved tokenizing (make better use of &iskeyword); make sure not to scan a buffer twice