Fix for comments, identifiers and phpTodo