diff --git a/jOOQ/src/main/java/org/jooq/impl/FieldProxy.java b/jOOQ/src/main/java/org/jooq/impl/FieldProxy.java
index 3bc23ab6fd..195b1c1eef 100644
--- a/jOOQ/src/main/java/org/jooq/impl/FieldProxy.java
+++ b/jOOQ/src/main/java/org/jooq/impl/FieldProxy.java
@@ -81,9 +81,7 @@ final class FieldProxy<T> extends AbstractField<T> implements TableField<Record,
     void delegate(AbstractField<T> newDelegate) {
         this.delegate = newDelegate;
 
-        // [#8278] Prevent StackOverflowErrors when the data type proxy is shared
-        if (!(newDelegate.getDataType() instanceof DataTypeProxy))
-            ((DataTypeProxy<T>) getDataType()).type((AbstractDataType<T>) newDelegate.getDataType());
+        ((DataTypeProxy<T>) getDataType()).type((AbstractDataType<T>) newDelegate.getDataType());
     }
 
     @Override
diff --git a/jOOQ/src/main/java/org/jooq/impl/ScopeStack.java b/jOOQ/src/main/java/org/jooq/impl/ScopeStack.java
index 41a4087c23..ecf5be7b71 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ScopeStack.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ScopeStack.java
@@ -118,14 +118,10 @@ final class ScopeStack<K, V> implements Iterable<V> {
             }
 
             private V move() {
-                while (it.hasNext()) {
-                    List<V> list = it.next();
-
-                    if (!list.isEmpty()) {
-                        next = list.get(list.size() - 1);
+                List<V> list;
+                while (it.hasNext())
+                    if (!(list = it.next()).isEmpty() && (next = list.get(list.size() - 1)) != null)
                         break;
-                    }
-                }
 
                 return next;
             }