Index: /reasoner/reasoner.tex
===================================================================
--- /reasoner/reasoner.tex	(revision 14)
+++ /reasoner/reasoner.tex	(revision 15)
@@ -175,40 +175,30 @@
   \SetAlgoLined
   \KwIn{configuration $cfg$, declaration $d$, variable $v$, access $ca$}
-  \KwData{constraint $base$, variable mapping $m$, internal constraints $c_i$, attribute constraints $c_a$, constraint variables $c_v$, default constraints $c_d$, deferred default constraints $c_dd$}
+  \KwData{constraint $base$, variable mapping $m$, internal constraints $c_i$, attribute constraints $c_a$, constraint variables $c_v$, default (deferred) constraints $c_d$ and $c_{dd}$}
   
       $c_i \assng c_i \cup translateDerivedDatatypeConstraints(d)$\;
       $c_a \assng c_a \cup translateAnnotationDefaults(cfg, d, \undef)$\;
-      $t \assng type(d)$; $dflt \assng default(d)$; $defltC \assng c_d$\;
-      \If{$isCompound(t)$}{
-            \uIf{$ deflt \neq \undef $}{
-                $t = type(deflt)$\;
-            }
+      $t \assng type(d)$; $dflt \assng default(d)$; $dfltS \assng c_d$\;
+      \uIf{$isCompound(t)$}{
+            \lIf{$ dflt \neq \undef $}{$t = type(dflt)$}
             \TBD{$resolveCompoundDefaultValueForDeclaration(d, v, ca, t)$}\;
-            \uIf{$ deflt \neq \undef $}{
-                $ deflt \assng deflt|_{self=d, varMap}$\;
-            }
-        } \ElseIf{$ deflt \neq \undef $}{
+            \lIf{$ dflt \neq \undef $}{$ dflt \assng deflt|_{self=d, m}$}
+        } \ElseIf{$ dflt \neq \undef $}{
           \uIf{$ isContainer(type(d)) $}{
-              \ForAll{$u \iterAssng \TBD{usedTypes(deflt)}$}{
+              \ForAll{$u \iterAssng \TBD{usedTypes(dflt)}$}{
                    \TBD{$collectCompoundsCollection(d, u)$}\;
               }
            }\ElseIf{$ca \neq \undef$}{
-               \uIf{$self \in deflt \vee \TBD{isOverridenSlot(d)}$}{
-                   $defltC \assng c_dd$
-               }
-               $deflt \assng deflt|_{self=ca}$
+               \lIf{$self \in deflt \vee \TBD{isOverridenSlot(d)}$}{$dfltS \assng c_{dd}$}
+               $dflt \assng dflt|_{self=ca}$\;
            }
         }
         $c_c \assng c_c \cup \TBD{collectionCompoundConstraints(d, v, \undef)}$\;
-        \If{$isContainer(t)$}{
-            $\TBD{collectionInternalConstraints(d, \undef)}$\;
-        }
+        \lIf{$isContainer(t)$}{$\TBD{collectionInternalConstraints(d, \undef)}$}
       \If{$ deflt \neq \undef $}{
           \uIf{$isConstraint(t)$}{
-              \uIf{$ ca \neq \undef $}{
-                  $c_v \assng c_v \cup (\createConstraint{deflt}, v)$\;
-              }
+              \lIf{$ ca \neq \undef $}{$c_v \assng c_v \cup (\createConstraint{dflt}, v)$}
           }\Else{
-              $defltC \assng defltC \cup \createDefaultConstraint{\IVML{assign}(\left.\begin{cases}ca, & \text{if } defltC = c_d \\ d, &\text{else}\end{cases}\right\}, deflt)}$\;
+              $dfltS \assng dfltS \cup \createDefaultConstraint{\IVML{assign}(\left.\begin{cases}ca, & \text{if } dfltS == c_d \\ d, &\text{else}\end{cases}\right\}, deflt)}$\;
           }
       }