Index: libcfa/src/containers/maybe.cfa
===================================================================
--- libcfa/src/containers/maybe.cfa	(revision ee06e41b1fa691fcca2f7a049a4e78f264265897)
+++ libcfa/src/containers/maybe.cfa	(revision c292244d4c299c228d7e40cd8a91071f5066c92f)
@@ -18,10 +18,10 @@
 
 
-forall(otype T)
+forall(T)
 void ?{}(maybe(T) & this) {
 	this.has_value = false;
 }
 
-forall(otype T)
+forall(T)
 void ?{}(maybe(T) & this, T value) {
 	this.has_value = true;
@@ -29,5 +29,5 @@
 }
 
-forall(otype T)
+forall(T)
 void ?{}(maybe(T) & this, maybe(T) other) {
 	this.has_value = other.has_value;
@@ -37,5 +37,5 @@
 }
 
-forall(otype T)
+forall(T)
 maybe(T) ?=?(maybe(T) & this, maybe(T) that) {
 	if (this.has_value && that.has_value) {
@@ -51,5 +51,5 @@
 }
 
-forall(otype T)
+forall(T)
 void ^?{}(maybe(T) & this) {
 	if (this.has_value) {
@@ -58,25 +58,25 @@
 }
 
-forall(otype T)
+forall(T)
 bool ?!=?(maybe(T) this, zero_t) {
 	return this.has_value;
 }
 
-forall(otype T)
+forall(T)
 maybe(T) maybe_value(T value) {
 	return (maybe(T)){value};
 }
 
-forall(otype T)
+forall(T)
 maybe(T) maybe_none() {
 	return (maybe(T)){};
 }
 
-forall(otype T)
+forall(T)
 bool has_value(maybe(T) * this) {
 	return this->has_value;
 }
 
-forall(otype T)
+forall(T)
 T get(maybe(T) * this) {
 	assertf(this->has_value, "attempt to get from maybe without value");
@@ -84,5 +84,5 @@
 }
 
-forall(otype T)
+forall(T)
 void set(maybe(T) * this, T value) {
 	if (this->has_value) {
@@ -94,5 +94,5 @@
 }
 
-forall(otype T)
+forall(T)
 void set_none(maybe(T) * this) {
 	if (this->has_value) {