Improve regex for identifiers. No matching keywords anymore