Index: libcfa/src/containers/result.hfa
===================================================================
--- libcfa/src/containers/result.hfa	(revision 73abe950d807eab747c9e14353b158fcca827308)
+++ libcfa/src/containers/result.hfa	(revision eb24cec0a055a7ee6a5524a7c6546fe58d49f85a)
@@ -19,5 +19,5 @@
 
 // DO NOT USE DIRECTLY!
-forall(otype T, otype E)
+forall(T, E)
 union inner_result{
 	T value;
@@ -25,5 +25,5 @@
 };
 
-forall(otype T, otype E)
+forall(T, E)
 struct result {
 	bool has_value;
@@ -32,46 +32,46 @@
 
 
-forall(otype T, otype E)
+forall(T, E)
 void ?{}(result(T, E) & this);
 
-forall(otype T, otype E)
+forall(T, E)
 void ?{}(result(T, E) & this, one_t, T value);
 
-forall(otype T, otype E)
+forall(T, E)
 void ?{}(result(T, E) & this, zero_t, E error);
 
-forall(otype T, otype E)
+forall(T, E)
 void ?{}(result(T, E) & this, result(T, E) other);
 
-forall(otype T, otype E)
+forall(T, E)
 void ^?{}(result(T, E) & this);
 
-forall(otype T, otype E)
+forall(T, E)
 result(T, E) ?=?(result(T, E) & this, result(T, E) other);
 
-forall(otype T, otype E)
+forall(T, E)
 bool ?!=?(result(T, E) this, zero_t);
 
 /* Wating for bug#11 to be fixed.
-forall(otype T, otype E)
+forall(T, E)
 result(T, E) result_value(T value);
 
-forall(otype T, otype E)
+forall(T, E)
 result(T, E) result_error(E error);
 */
 
-forall(otype T, otype E)
+forall(T, E)
 bool has_value(result(T, E) * this);
 
-forall(otype T, otype E)
+forall(T, E)
 T get(result(T, E) * this);
 
-forall(otype T, otype E)
+forall(T, E)
 E get_error(result(T, E) * this);
 
-forall(otype T, otype E)
+forall(T, E)
 void set(result(T, E) * this, T value);
 
-forall(otype T, otype E)
+forall(T, E)
 void set_error(result(T, E) * this, E error);