Follow-up to CLs 2933723002 and 2932973003.

pkg/front_end/lib/src/fasta/kernel/body_builder.dart

 // Copyright (c) 2016, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library fasta.body_builder;
 
 import '../fasta_codes.dart'
     show
         FastaMessage,
         codeConstFieldWithoutInitializer,
@@ skipping 2023 matching lines @@
       return throwNoSuchMethodError(new NullLiteral()..fileOffset = charOffset,
           target.name.name, arguments, charOffset);
     }
     if (target is Constructor) {
       if (isConst && !target.isConst) {
         return buildCompileTimeError("Not a const constructor.", charOffset);
       }
       return new KernelConstructorInvocation(target, initialTarget, arguments,
           isConst: isConst)
         ..fileOffset = charOffset;
-    } else if (target is Procedure && target.kind == ProcedureKind.Factory) {
-      return new KernelFactoryConstructorInvocation(
-          target, initialTarget, arguments,
-          isConst: isConst)
-        ..fileOffset = charOffset;
     } else {
-      Procedure factory = target;
-      if (isConst && !factory.isConst) {
+      Procedure procedure = target;
+      if (isConst && !procedure.isConst) {
         return buildCompileTimeError("Not a const factory.", charOffset);
+      } else if (procedure.isFactory) {
+        return new KernelFactoryConstructorInvocation(
+            target, initialTarget, arguments,
+            isConst: isConst)
+          ..fileOffset = charOffset;
+      } else {
+        return new KernelStaticInvocation(target, arguments, isConst: isConst)
+          ..fileOffset = charOffset;
       }
-      return new KernelStaticInvocation(target, arguments, isConst: isConst)
-        ..fileOffset = charOffset;
     }
   }
 
   @override
   bool checkArguments(FunctionNode function, Arguments arguments,
       List<TypeParameter> typeParameters) {
     if (arguments.positional.length < function.requiredParameterCount ||
         arguments.positional.length > function.positionalParameters.length) {
       return false;
     }
@@ skipping 1485 matching lines @@
     if (starToken == null) {
       return AsyncMarker.Async;
     } else {
       assert(identical(starToken.stringValue, "*"));
       return AsyncMarker.AsyncStar;
     }
   } else {
     return internalError("Unknown async modifier: $asyncToken");
   }
 }