Index: libcfa/src/containers/result.cfa
===================================================================
--- libcfa/src/containers/result.cfa	(revision ee06e41b1fa691fcca2f7a049a4e78f264265897)
+++ libcfa/src/containers/result.cfa	(revision b0d5c0c16620305b9334dac680cf6fc824ff1d4b)
@@ -18,5 +18,5 @@
 
 
-forall(otype T, otype E)
+forall(T, E)
 void ?{}(result(T, E) & this) {
 	this.has_value = false;
@@ -24,5 +24,5 @@
 }
 
-forall(otype T, otype E)
+forall(T, E)
 void ?{}(result(T, E) & this, one_t, T value) {
 	this.has_value = true;
@@ -30,5 +30,5 @@
 }
 
-forall(otype T, otype E)
+forall(T, E)
 void ?{}(result(T, E) & this, zero_t, E error) {
 	this.has_value = false;
@@ -36,5 +36,5 @@
 }
 
-forall(otype T, otype E)
+forall(T, E)
 void ?{}(result(T, E) & this, result(T, E) other) {
 	this.has_value = other.has_value;
@@ -46,5 +46,5 @@
 }
 
-forall(otype T, otype E)
+forall(T, E)
 result(T, E) ?=?(result(T, E) & this, result(T, E) that) {
 	if (this.has_value && that.has_value) {
@@ -63,5 +63,5 @@
 }
 
-forall(otype T, otype E)
+forall(T, E)
 void ^?{}(result(T, E) & this) {
 	if (this.has_value) {
@@ -72,25 +72,25 @@
 }
 
-forall(otype T, otype E)
+forall(T, E)
 bool ?!=?(result(T, E) this, zero_t) {
 	return this.has_value;
 }
 
-forall(otype T, otype E)
+forall(T, E)
 result(T, E) result_value(T value) {
 	return (result(T, E)){1, value};
 }
 
-forall(otype T, otype E)
+forall(T, E)
 result(T, E) result_error(E error) {
 	return (result(T, E)){0, error};
 }
 
-forall(otype T, otype E)
+forall(T, E)
 bool has_value(result(T, E) * this) {
 	return this->has_value;
 }
 
-forall(otype T, otype E)
+forall(T, E)
 T get(result(T, E) * this) {
 	assertf(this->has_value, "attempt to get from result without value");
@@ -98,5 +98,5 @@
 }
 
-forall(otype T, otype E)
+forall(T, E)
 E get_error(result(T, E) * this) {
 	assertf(!this->has_value, "attempt to get from result without error");
@@ -104,5 +104,5 @@
 }
 
-forall(otype T, otype E)
+forall(T, E)
 void set(result(T, E) * this, T value) {
 	if (this->has_value) {
@@ -115,5 +115,5 @@
 }
 
-forall(otype T, otype E)
+forall(T, E)
 void set_error(result(T, E) * this, E error) {
 	if (this->has_value) {