| Index: pkg/compiler/lib/src/elements/modelx.dart | 
| diff --git a/pkg/compiler/lib/src/elements/modelx.dart b/pkg/compiler/lib/src/elements/modelx.dart | 
| index 5c74d62e6ad7baaf175bc740ec4b3a7def35714a..65742316c66ff25e990a162e3b8f69e1f1b68f9f 100644 | 
| --- a/pkg/compiler/lib/src/elements/modelx.dart | 
| +++ b/pkg/compiler/lib/src/elements/modelx.dart | 
| @@ -37,9 +37,10 @@ import '../resolution/typedefs.dart' show | 
| TypedefCyclicVisitor; | 
| import '../script.dart'; | 
| import '../tokens/token.dart' show | 
| -    EOF_TOKEN, | 
| ErrorToken, | 
| Token; | 
| +import '../tokens/token_constants.dart' as Tokens show | 
| +    EOF_TOKEN; | 
| import '../tree/tree.dart'; | 
| import '../util/util.dart'; | 
|  | 
| @@ -138,7 +139,7 @@ abstract class ElementX extends Element with ElementCommon { | 
| String needle = isConstructor ? enclosingClassName : name; | 
| // The unary '-' operator has a special element name (specified). | 
| if (needle == 'unary-') needle = '-'; | 
| -    for (Token t = token; EOF_TOKEN != t.kind; t = t.next) { | 
| +    for (Token t = token; Tokens.EOF_TOKEN != t.kind; t = t.next) { | 
| if (t is !ErrorToken && needle == t.value) return t; | 
| } | 
| return token; | 
|  |