diff --git a/cgi.d b/cgi.d
index 2f51918..ab588f9 100644
--- a/cgi.d
+++ b/cgi.d
@@ -922,7 +922,7 @@ string[string] decodeVariablesSingle(string data) {
 	return va;
 }
 
-string encodeVariables(string[string] data) {
+string encodeVariables(in string[string] data) {
 	string ret;
 
 	bool outputted = false;
@@ -938,7 +938,7 @@ string encodeVariables(string[string] data) {
 	return ret;
 }
 
-string encodeVariables(string[][string] data) {
+string encodeVariables(in string[][string] data) {
 	string ret;
 
 	bool outputted = false;
diff --git a/dom.d b/dom.d
index a26a1de..80d3d96 100644
--- a/dom.d
+++ b/dom.d
@@ -1165,6 +1165,24 @@ class Element {
 		this.children.length = 0; // we reparented them all above
 	}
 
+	/// shorthand for this.parentNode.removeChild(this) with parentNode null check
+	Element removeFromTree()
+		in {
+
+		}
+		out(var) {
+			assert(this.parentNode is null);
+			assert(var is this);
+		}
+	body {
+		if(this.parentNode is null)
+			return this;
+
+		this.parentNode.removeChild(this);
+
+		return this;
+	}
+
 	Element replaceWith(Element e) {
 		if(e.parentNode !is null)
 			e.parentNode.removeChild(e);
@@ -1348,6 +1366,8 @@ dchar parseEntity(in dchar[] entity) {
 		case "deg":
 		case "micro"
 		*/
+		case "hellip":
+			return '\u2026';
 		case "laquo":
 			return '\u00ab';
 		case "raquo":