minor cleanup

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/FcntlModuleBuiltins.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/TypeBuiltins.java

@@ -219,10 +219,10 @@ protected Object doItUnboxed(VirtualFrame frame, @SuppressWarnings("unused") PNo
         @Specialization(replaces = "doItUnboxed")
         protected Object doItUnboxedIndirect(VirtualFrame frame, @SuppressWarnings("unused") PNone noSelf, Object[] arguments, PKeyword[] keywords) {
             Object self = arguments[0];
-            if (self instanceof PythonAbstractClass) {
+            if (PGuards.isClass(self)) {
                 return op(frame, (PythonAbstractClass) self, arguments, keywords, false);
             } else if (self instanceof PythonBuiltinClassType) {
-                PythonBuiltinClass actual = getContext().getCore().lookupType((PythonBuiltinClassType) self);
+                PythonBuiltinClass actual = getBuiltinPythonClass((PythonBuiltinClassType) self);
                 return op(frame, actual, arguments, keywords, false);
             } else {
                 throw raise(TypeError, "descriptor '__call__' requires a 'type' object but received a '%p'", self);