Edited isDirective() and isIdentifier()