diff --git a/packages/moon/dist/moon.js b/packages/moon/dist/moon.js
index 91c8e364..fcd9d5ff 100644
--- a/packages/moon/dist/moon.js
+++ b/packages/moon/dist/moon.js
@@ -114,23 +114,12 @@
 		"\n": "\\n",
 		"\r": "\\r"
 	};
-	/**
-	 * Checks if a given character is a quote.
-	 *
-	 * @param {string} char
-	 * @returns {boolean} True if the character is a quote
-	 */
-
-	function isQuote(_char) {
-		return _char === "\"" || _char === "'";
-	}
 	/**
 	 * Escape text to make it usable in a JavaScript string literal.
 	 *
 	 * @param {string} text
 	 */
 
-
 	function escapeText(text) {
 		return text.replace(textRE, function (match) {
 			return escapeTextMap[match];
@@ -144,9 +133,22 @@
 
 
 	function scopeExpression(expression) {
-		return expression.replace(expressionRE, function (match, name) {
-			return name === undefined || name[0] === "$" || globals.indexOf(name) !== -1 ? match : "data." + name;
+		var isStatic = true;
+		var value = expression.replace(expressionRE, function (match, name) {
+			if (name === undefined || globals.indexOf(name) !== -1) {
+				// Return a static match if there are no dynamic names or if it is a
+				// global variable.
+				return match;
+			} else {
+				// Return a dynamic match if there is a dynamic name or a local.
+				isStatic = false;
+				return name[0] === "$" ? match : "data." + name;
+			}
 		});
+		return {
+			value: value,
+			isStatic: isStatic
+		};
 	}
 	/**
 	 * Convert a token into a string, accounting for `<text/>` components.
@@ -163,10 +165,10 @@
 				// and doesn't need the quotes. If not, it was an expression and
 				// needs to be formatted with curly braces.
 
-				if (isQuote(content[0])) {
-					return content.slice(1, -1);
+				if (content.isStatic) {
+					return content.value.slice(1, -1);
 				} else {
-					return "{" + content + "}";
+					return "{" + content.value + "}";
 				}
 			} else {
 				var tag = "<" + token.value;
@@ -174,7 +176,7 @@
 
 				for (var attributeKey in attributes) {
 					var attributeValue = attributes[attributeKey];
-					tag += " " + attributeKey + "=" + (isQuote(attributeValue[0]) ? attributeValue : "{" + attributeValue + "}");
+					tag += " " + attributeKey + "=" + (attributeValue.isStatic ? attributeValue.value : "{" + attributeValue.value + "}");
 				}
 
 				if (token.closed) {
@@ -230,9 +232,9 @@
 		var tokens = [];
 
 		for (var i = 0; i < input.length;) {
-			var _char2 = input[i];
+			var _char = input[i];
 
-			if (_char2 === "<") {
+			if (_char === "<") {
 				var charNext = input[i + 1];
 
 				if ("development" === "development" && charNext === undefined) {
@@ -308,10 +310,18 @@
 					} else {
 						// Store the key/value pair using the matched value or
 						// expression.
-						attributes[attributeKey] = attributeExpression === undefined ? attributeValue === undefined ? "\"\"" : attributeValue : scopeExpression(attributeExpression); // Add a wrapper function for events.
+						if (attributeExpression === undefined) {
+							attributes[attributeKey] = {
+								value: attributeValue === undefined ? "\"\"" : attributeValue,
+								isStatic: true
+							};
+						} else {
+							attributes[attributeKey] = scopeExpression(attributeExpression);
+						} // Add a wrapper function for events.
+
 
 						if (attributeKey[0] === "@") {
-							attributes[attributeKey] = "function($event){" + attributes[attributeKey] + "}";
+							attributes[attributeKey].value = "function($event){" + attributes[attributeKey].value + "}";
 						}
 					}
 				} // Append an opening tag token with the name, attributes, and optional
@@ -325,18 +335,18 @@
 					closed: closeSlash === "/"
 				});
 				i += nameMatch.length;
-			} else if (_char2 === "{") {
+			} else if (_char === "{") {
 				// If a sequence of characters begins with "{", process it as an
 				// expression token.
 				var expression = ""; // Consume the input until the end of the expression.
 
 				for (i += 1; i < input.length; i++) {
-					var _char3 = input[i];
+					var _char2 = input[i];
 
-					if (_char3 === "}") {
+					if (_char2 === "}") {
 						break;
 					} else {
-						expression += _char3;
+						expression += _char2;
 					}
 				} // Append the expression as a `<text/>` element with the appropriate
 				// text content attribute.
@@ -356,12 +366,12 @@
 				var text = ""; // Consume the input until the start of a new tag or expression.
 
 				for (; i < input.length; i++) {
-					var _char4 = input[i];
+					var _char3 = input[i];
 
-					if (_char4 === "<" || _char4 === "{") {
+					if (_char3 === "<" || _char3 === "{") {
 						break;
 					} else {
-						text += _char4;
+						text += _char3;
 					}
 				} // Append the text as a `<text/>` element with the appropriate text
 				// content attribute if it isn't only whitespace.
@@ -372,7 +382,10 @@
 						type: "tagOpen",
 						value: "text",
 						attributes: {
-							"": "\"" + escapeText(text) + "\""
+							"": {
+								value: "\"" + escapeText(text) + "\"",
+								isStatic: true
+							}
 						},
 						closed: true
 					});
@@ -622,11 +635,12 @@
 
 	function generateNodeIf(element, parent, index, staticNodes) {
 		var variable = "m" + generateVariable;
+		var attributes = element.attributes;
 		var prelude = "";
 		var emptyElseClause = true;
 		setGenerateVariable(generateVariable + 1); // Generate the initial `if` clause.
 
-		prelude += "var " + variable + ";if(" + element.attributes[""] + "){" + generateClause(variable, element, staticNodes) + "}"; // Search for `else-if` and `else` clauses if there are siblings.
+		prelude += "var " + variable + ";if(" + attributes[""].value + "){" + generateClause(variable, element, staticNodes) + "}"; // Search for `else-if` and `else` clauses if there are siblings.
 
 		if (parent !== null) {
 			var siblings = parent.children;
@@ -636,7 +650,7 @@
 
 				if (sibling.name === "else-if") {
 					// Generate the `else-if` clause.
-					prelude += "else if(" + sibling.attributes[""] + "){" + generateClause(variable, sibling, staticNodes) + "}"; // Remove the `else-if` clause so that it isn't generated
+					prelude += "else if(" + attributes[""].value + "){" + generateClause(variable, sibling, staticNodes) + "}"; // Remove the `else-if` clause so that it isn't generated
 					// individually by the parent.
 
 					siblings.splice(i, 1);
@@ -681,9 +695,10 @@
 
 	function generateNodeFor(element, staticNodes) {
 		var variable = "m" + generateVariable;
-		var dataLocals = element.attributes[""].split(",");
-		var dataArray = element.attributes.of;
-		var dataObject = element.attributes["in"];
+		var attributes = element.attributes;
+		var dataLocals = attributes[""].value.split(",");
+		var dataArray = attributes.of;
+		var dataObject = attributes["in"];
 		var dataKey;
 		var dataValue;
 		var prelude;
@@ -704,6 +719,7 @@
 			// Generate a `for` loop over an object. The first local is the key and
 			// the second is the value.
 			var dataObjectValue;
+			dataObject = dataObject.value;
 			dataKey = dataLocals[0];
 
 			if (dataLocals.length === 2) {
@@ -717,6 +733,7 @@
 		} else {
 			// Generate a `for` loop over an array. The first local is the value and
 			// the second is the key (index).
+			dataArray = dataArray.value;
 			dataKey = dataLocals.length === 2 ? dataLocals[1] : "mi";
 			dataValue = dataLocals[0];
 			prelude = "for(var " + dataKey + "=0;" + dataKey + "<" + dataArray + ".length;" + dataKey + "++){var " + dataValue + "=" + dataArray + "[" + dataKey + "];" + body + "}";
@@ -765,11 +782,11 @@
 			var attributeValue = attributes[attribute]; // Mark the current node as dynamic if there are any events or dynamic
 			// attributes.
 
-			if (attribute[0] === "@" || attributeValue[0] !== "\"" && attributeValue[0] !== "'") {
+			if (attribute[0] === "@" || !attributeValue.isStatic) {
 				isStatic = false;
 			}
 
-			data += separator + "\"" + attribute + "\":" + attributeValue;
+			data += separator + "\"" + attribute + "\":" + attributeValue.value;
 			separator = ",";
 		}
 
diff --git a/packages/moon/dist/moon.min.js b/packages/moon/dist/moon.min.js
index 78cf4a35..5a3ddbc5 100644
--- a/packages/moon/dist/moon.min.js
+++ b/packages/moon/dist/moon.min.js
@@ -4,4 +4,4 @@
  * Released under the MIT License
  * https://kbrsh.github.io/moon
  */
-!function(e,n){"undefined"==typeof module?e.Moon=n():module.exports=n()}(this,function(){"use strict";var b={element:0,text:1,component:2};var y,A=/^\s+$/,k=/<([\w\d-_]+)([^>]*?)(\/?)>/g,S=/\s*([\w\d-_:@]*)(?:=(?:("[^"]*"|'[^']*')|{([^{}]*)}))?/g,n=/"[^"]*"|'[^']*'|\d+[a-zA-Z$_]\w*|\.[a-zA-Z$_]\w*|[a-zA-Z$_]\w*:|([a-zA-Z$_]\w*)/g,C=/&amp;|&gt;|&lt;|&nbsp;|&quot;|\\|"|\n|\r/g,t=["NaN","false","in","null","this","true","typeof","undefined","window"],P={"&amp;":"&","&gt;":">","&lt;":"<","&nbsp;":" ","&quot;":'\\"',"\\":"\\\\",'"':'\\"',"\n":"\\n","\r":"\\r"};function q(e){return e.replace(n,function(e,n){return void 0===n||"$"===n[0]||-1!==t.indexOf(n)?e:"data."+n})}function r(e){e=e.trim();for(var n,t=[],r=0;r<e.length;){var a=e[r];if("<"===a){var o=e[r+1];if("/"===o){var i=e.indexOf(">",r+2),u=e.slice(r+2,i);0,t.push({type:"tagClose",value:u}),r=i+1;continue}if("!"===o&&"-"===e[r+2]&&"-"===e[r+3]){var l=e.indexOf("--\x3e",r+4);0,r=l+3;continue}k.lastIndex=r;var d=k.exec(e);0;for(var f=d[0],s=d[1],p=d[2],c=d[3],v={},h=void 0;null!==(h=S.exec(p));){var m=h[0],g=h[1],w=h[2],b=h[3];0===m.length?S.lastIndex+=1:(v[g]=void 0===b?void 0===w?'""':w:q(b),"@"===g[0]&&(v[g]="function($event){"+v[g]+"}"))}t.push({type:"tagOpen",value:s,attributes:v,closed:"/"===c}),r+=f.length}else if("{"===a){var y="";for(r+=1;r<e.length;r++){var x=e[r];if("}"===x)break;y+=x}t.push({type:"tagOpen",value:"text",attributes:{"":q(y)},closed:!0}),r+=1}else{for(var N="";r<e.length;r++){var O=e[r];if("<"===O||"{"===O)break;N+=O}A.test(N)||t.push({type:"tagOpen",value:"text",attributes:{"":'"'+(n=N,n.replace(C,function(e){return P[e]}))+'"'},closed:!0})}}return t}function f(e,n,t,r){this.message=e,this.start=n,this.end=t,this.next=r}function s(e,n,t){var r=t[e],a=t[n-1],o=n-e;if(0==o)return new f("",e,n);if(1==o)return"tagOpen"===r.type&&!0===r.closed?{name:r.value,attributes:r.attributes,children:[]}:new f("",e,n);if("tagOpen"!==r.type||"tagClose"!==a.type||r.value!==a.value)return new f("",e,n);var i=function e(n,t,r){var a;if(0==t-n)return[];for(var o=n+1;o<=t;o++){var i=s(n,o,r);if(i instanceof f)a=i;else{var u=e(o,t,r);if(!(u instanceof f)){for(var l=[i],d=0;d<u.length;d++)l.push(u[d]);return l}}}return new f("",n,t,a)}(e+1,n-1,t);return i instanceof f?new f("",e,n,i):{name:r.value,attributes:r.attributes,children:i}}function a(e){var n=s(0,e.length,e);return n}function x(e){y=e}function N(e,n,t){var r,a=O(n.children[0],n,0,t);return a.isStatic?(r=e+"=m["+t.length+"];",t.push(a)):r=""+a.prelude+e+"="+a.node+";",r}function O(e,n,t,r){var a,o=e.name,i=!0;if("if"===o)return function(e,n,t,r){var a="m"+y,o="",i=!0;if(x(y+1),o+="var "+a+";if("+e.attributes[""]+"){"+N(a,e,r)+"}",null!==n)for(var u=n.children,l=t+1;l<u.length;){var d=u[l];if("else-if"===d.name)o+="else if("+d.attributes[""]+"){"+N(a,d,r)+"}",u.splice(l,1);else{if("else"!==d.name)break;o+="else{"+N(a,d,r)+"}",i=!1,u.splice(l,1)}}return i&&(o+="else{"+a+"=m["+r.length+"];}",r.push({prelude:"",node:"{type:"+b.text+',name:"text",data:{"":"",children:[]}}',isStatic:!0})),{prelude:o,node:a,isStatic:!1}}(e,n,t,r);if("for"===o)return function(e,n){var t,r,a="m"+y,o=e.attributes[""].split(","),i=e.attributes.of,u=e.attributes.in;x(y+1);var l,d=O(e.children[0],e,0,n);return d.isStatic?(l=a+".push(m["+n.length+"]);",n.push(d)):l=d.prelude+a+".push("+d.node+");",r=void 0===i?"for(var "+(t=o[0])+" in "+u+"){"+(2===o.length?"var "+o[1]+"="+u+"["+t+"];":"")+l+"}":"for(var "+(t=2===o.length?o[1]:"mi")+"=0;"+t+"<"+i+".length;"+t+"++){var "+o[0]+"="+i+"["+t+"];"+l+"}",{prelude:"var "+a+"=[];"+r,node:"{type:"+b.element+',name:"span",data:{children:'+a+"}}",isStatic:!1}}(e,r);a="text"===o?b.text:o[0]===o[0].toLowerCase()?b.element:b.component;var u=e.attributes,l="",d="{",f="";for(var s in u){var p=u[s];("@"===s[0]||'"'!==p[0]&&"'"!==p[0])&&(i=!1),d+=f+'"'+s+'":'+p,f=","}if(void 0===u.children){var c=e.children,v=[];d+=f+"children:[",f="";for(var h=0;h<c.length;h++){var m=O(c[h],e,h,r);m.isStatic||(i=!1),v.push(m)}for(var g=0;g<v.length;g++){var w=v[g];i||!w.isStatic?(l+=w.prelude,d+=f+w.node):(d+=f+"m["+r.length+"]",r.push(w)),f=","}d+="]"}return{prelude:l,node:"{type:"+a+',name:"'+o+'",data:'+d+"}}",isStatic:i}}function o(e){var n=[];x(0);var t=O(e,null,0,n),r=t.prelude,a=t.node;if(t.isStatic)return"if(m[0]===undefined){"+r+"m[0]="+a+";}return m[0];";if(0===n.length)return r+"return "+a+";";for(var o="if(m[0]===undefined){",i=0;i<n.length;i++){var u=n[i];o+=u.prelude+"m["+i+"]="+u.node+";"}return""+(o+="}")+r+"return "+a+";"}function i(e){return o(a(r(e)))}var d,p,u,$,l={},c={},v=[];function h(e){p=e}var _=[],E={updateText:0,updateData:1,appendNode:2,removeNode:3,replaceNode:4};function F(e){var r,n=[];if(e.type===b.text)r=document.createTextNode(e.data[""]);else{var a=e.data;r=document.createElement(e.name);var t=function(n){var e=a[n];if("@"===n[0]){var t=r.MoonEvents;void 0===t?t=r.MoonEvents=function(e,n,t){return n in e?Object.defineProperty(e,n,{value:t,enumerable:!0,configurable:!0,writable:!0}):e[n]=t,e}({},n,e):t[n]=e,r.addEventListener(n.slice(1),function(e){t[n](e)})}else"children"!==n&&!1!==e&&r.setAttribute(n,e)};for(var o in a)t(o);for(var i=a.children,u=0;u<i.length;u++){var l=F(i[u]);r.appendChild(l.element),n.push(l)}}return{element:r,node:e,children:n}}function m(e,n,t){for(;;){var r=e.pop(),a=r.node,o=n.pop();if(a!==o)if(a.name!==o.name)t.push({type:E.replaceNode,nodeOld:r,nodeNew:o,nodeParent:null});else if(a.type===b.text)a.data[""]!==o.data[""]&&t.push({type:E.updateText,nodeOld:r,nodeNew:o,nodeParent:null});else{t.push({type:E.updateData,nodeOld:r,nodeNew:o,nodeParent:null});var i=r.children,u=o.data.children,l=i.length,d=u.length;if(l===d)for(var f=0;f<l;f++)e.push(i[f]),n.push(u[f]);else if(d<l){for(var s=0;s<d;s++)e.push(i[s]),n.push(u[s]);for(var p=d;p<l;p++)t.push({type:E.removeNode,nodeOld:i[p],nodeNew:null,nodeParent:r})}else{for(var c=0;c<l;c++)e.push(i[c]),n.push(u[c]);for(var v=l;v<d;v++)t.push({type:E.appendNode,nodeOld:null,nodeNew:u[v],nodeParent:r})}}if(0===e.length){g(t);break}if(16<=performance.now()-$){requestAnimationFrame(function(){$=performance.now(),m(e,n,t)});break}}}function g(e){for(var n=0;n<e.length;n++){var t=e[n];switch(t.type){case E.updateText:var r=t.nodeOld,a=t.nodeNew;r.element.textContent=a.data[""],r.node=a;break;case E.updateData:var o=t.nodeOld,i=o.node.data,u=o.element,l=t.nodeNew,d=l.data;for(var f in d){var s=d[f];"@"===f[0]?u.MoonEvents[f]=s:"children"!==f&&(!1===s?u.removeAttribute(f):u.setAttribute(f,s))}for(var p in i)p in d||u.removeAttribute(p);o.node=l;break;case E.appendNode:var c=t.nodeParent,v=F(t.nodeNew);c.element.appendChild(v.element),c.children.push(v);break;case E.removeNode:var h=t.nodeParent;h.element.removeChild(h.children.pop().element);break;case E.replaceNode:var m=t.nodeOld,g=m.element,w=F(t.nodeNew),b=w.element;g.parentNode.replaceChild(b,g),m.element=b,m.node=w.node,m.children=w.children}}_.shift(),0!==_.length&&(16<=performance.now()-$?requestAnimationFrame(function(){$=performance.now(),z()}):z())}function z(){var e=_[0];for(var n in e)l[n]=e[n];var t=u(l);h(t),function e(n,t,r){for(;;){var a=n.pop(),o=t.pop(),i=r.pop();a.type===b.component&&(a=c[a.name](a.data),null===o?h(a):o.data.children[i]=a);for(var u=a.data.children,l=0;l<u.length;l++)n.push(u[l]),t.push(a),r.push(l);if(0===n.length){m([d],[p],[]);break}if(16<=performance.now()-$){requestAnimationFrame(function(){$=performance.now(),e(n,t,r)});break}}}([t],[null],[0])}function w(e){_.push(e),1===_.length&&requestAnimationFrame(function(){$=performance.now(),z()})}function e(n){var t=function(e,n){return void 0===e?n:e}(n.name,"Root");delete n.name;var r=n.view;delete n.view,"string"==typeof r&&(r=new Function("m","data",i(r))),v[t]=[];var e=function(e){return r(v[t],function(e,n){var t={};for(var r in e)t[r]=e[r];for(var a in n)a in e||(t[a]=n[a]);return t}(e,n))};if("Root"===t){var a="string"==typeof n.root?document.querySelector(n.root):n.root;delete n.root,function(e){d=e}({element:a,node:{type:b.element,name:a.tagName.toLowerCase(),data:{children:[]}},children:[]}),function(e){u=e}(e),w(n)}else c[t]=e}return e.lex=r,e.parse=a,e.generate=o,e.compile=i,e.components=c,e.get=l,e.set=w,e});
\ No newline at end of file
+!function(e,n){"undefined"==typeof module?e.Moon=n():module.exports=n()}(this,function(){"use strict";var b={element:0,text:1,component:2};var y,S=/^\s+$/,A=/<([\w\d-_]+)([^>]*?)(\/?)>/g,k=/\s*([\w\d-_:@]*)(?:=(?:("[^"]*"|'[^']*')|{([^{}]*)}))?/g,n=/"[^"]*"|'[^']*'|\d+[a-zA-Z$_]\w*|\.[a-zA-Z$_]\w*|[a-zA-Z$_]\w*:|([a-zA-Z$_]\w*)/g,C=/&amp;|&gt;|&lt;|&nbsp;|&quot;|\\|"|\n|\r/g,r=["NaN","false","in","null","this","true","typeof","undefined","window"],P={"&amp;":"&","&gt;":">","&lt;":"<","&nbsp;":" ","&quot;":'\\"',"\\":"\\\\",'"':'\\"',"\n":"\\n","\r":"\\r"};function q(e){var t=!0;return{value:e.replace(n,function(e,n){return void 0===n||-1!==r.indexOf(n)?e:(t=!1,"$"===n[0]?e:"data."+n)}),isStatic:t}}function t(e){e=e.trim();for(var n,t=[],r=0;r<e.length;){var a=e[r];if("<"===a){var o=e[r+1];if("/"===o){var i=e.indexOf(">",r+2),l=e.slice(r+2,i);0,t.push({type:"tagClose",value:l}),r=i+1;continue}if("!"===o&&"-"===e[r+2]&&"-"===e[r+3]){var u=e.indexOf("--\x3e",r+4);0,r=u+3;continue}A.lastIndex=r;var d=A.exec(e);0;for(var f=d[0],v=d[1],s=d[2],p=d[3],c={},h=void 0;null!==(h=k.exec(s));){var m=h[0],g=h[1],w=h[2],b=h[3];0===m.length?k.lastIndex+=1:(c[g]=void 0===b?{value:void 0===w?'""':w,isStatic:!0}:q(b),"@"===g[0]&&(c[g].value="function($event){"+c[g].value+"}"))}t.push({type:"tagOpen",value:v,attributes:c,closed:"/"===p}),r+=f.length}else if("{"===a){var y="";for(r+=1;r<e.length;r++){var x=e[r];if("}"===x)break;y+=x}t.push({type:"tagOpen",value:"text",attributes:{"":q(y)},closed:!0}),r+=1}else{for(var N="";r<e.length;r++){var O=e[r];if("<"===O||"{"===O)break;N+=O}S.test(N)||t.push({type:"tagOpen",value:"text",attributes:{"":{value:'"'+(n=N,n.replace(C,function(e){return P[e]}))+'"',isStatic:!0}},closed:!0})}}return t}function f(e,n,t,r){this.message=e,this.start=n,this.end=t,this.next=r}function v(e,n,t){var r=t[e],a=t[n-1],o=n-e;if(0==o)return new f("",e,n);if(1==o)return"tagOpen"===r.type&&!0===r.closed?{name:r.value,attributes:r.attributes,children:[]}:new f("",e,n);if("tagOpen"!==r.type||"tagClose"!==a.type||r.value!==a.value)return new f("",e,n);var i=function e(n,t,r){var a;if(0==t-n)return[];for(var o=n+1;o<=t;o++){var i=v(n,o,r);if(i instanceof f)a=i;else{var l=e(o,t,r);if(!(l instanceof f)){for(var u=[i],d=0;d<l.length;d++)u.push(l[d]);return u}}}return new f("",n,t,a)}(e+1,n-1,t);return i instanceof f?new f("",e,n,i):{name:r.value,attributes:r.attributes,children:i}}function a(e){var n=v(0,e.length,e);return n}function x(e){y=e}function N(e,n,t){var r,a=O(n.children[0],n,0,t);return a.isStatic?(r=e+"=m["+t.length+"];",t.push(a)):r=""+a.prelude+e+"="+a.node+";",r}function O(e,n,t,r){var a,o=e.name,i=!0;if("if"===o)return function(e,n,t,r){var a="m"+y,o=e.attributes,i="",l=!0;if(x(y+1),i+="var "+a+";if("+o[""].value+"){"+N(a,e,r)+"}",null!==n)for(var u=n.children,d=t+1;d<u.length;){var f=u[d];if("else-if"===f.name)i+="else if("+o[""].value+"){"+N(a,f,r)+"}",u.splice(d,1);else{if("else"!==f.name)break;i+="else{"+N(a,f,r)+"}",l=!1,u.splice(d,1)}}return l&&(i+="else{"+a+"=m["+r.length+"];}",r.push({prelude:"",node:"{type:"+b.text+',name:"text",data:{"":"",children:[]}}',isStatic:!0})),{prelude:i,node:a,isStatic:!1}}(e,n,t,r);if("for"===o)return function(e,n){var t,r,a="m"+y,o=e.attributes,i=o[""].value.split(","),l=o.of,u=o.in;x(y+1);var d,f=O(e.children[0],e,0,n);return f.isStatic?(d=a+".push(m["+n.length+"]);",n.push(f)):d=f.prelude+a+".push("+f.node+");",r=void 0===l?(u=u.value,"for(var "+(t=i[0])+" in "+u+"){"+(2===i.length?"var "+i[1]+"="+u+"["+t+"];":"")+d+"}"):(l=l.value,"for(var "+(t=2===i.length?i[1]:"mi")+"=0;"+t+"<"+l+".length;"+t+"++){var "+i[0]+"="+l+"["+t+"];"+d+"}"),{prelude:"var "+a+"=[];"+r,node:"{type:"+b.element+',name:"span",data:{children:'+a+"}}",isStatic:!1}}(e,r);a="text"===o?b.text:o[0]===o[0].toLowerCase()?b.element:b.component;var l=e.attributes,u="",d="{",f="";for(var v in l){var s=l[v];"@"!==v[0]&&s.isStatic||(i=!1),d+=f+'"'+v+'":'+s.value,f=","}if(void 0===l.children){var p=e.children,c=[];d+=f+"children:[",f="";for(var h=0;h<p.length;h++){var m=O(p[h],e,h,r);m.isStatic||(i=!1),c.push(m)}for(var g=0;g<c.length;g++){var w=c[g];i||!w.isStatic?(u+=w.prelude,d+=f+w.node):(d+=f+"m["+r.length+"]",r.push(w)),f=","}d+="]"}return{prelude:u,node:"{type:"+a+',name:"'+o+'",data:'+d+"}}",isStatic:i}}function o(e){var n=[];x(0);var t=O(e,null,0,n),r=t.prelude,a=t.node;if(t.isStatic)return"if(m[0]===undefined){"+r+"m[0]="+a+";}return m[0];";if(0===n.length)return r+"return "+a+";";for(var o="if(m[0]===undefined){",i=0;i<n.length;i++){var l=n[i];o+=l.prelude+"m["+i+"]="+l.node+";"}return""+(o+="}")+r+"return "+a+";"}function i(e){return o(a(t(e)))}var d,s,l,$,u={},p={},c=[];function h(e){s=e}var _=[],E={updateText:0,updateData:1,appendNode:2,removeNode:3,replaceNode:4};function F(e){var r,n=[];if(e.type===b.text)r=document.createTextNode(e.data[""]);else{var a=e.data;r=document.createElement(e.name);var t=function(n){var e=a[n];if("@"===n[0]){var t=r.MoonEvents;void 0===t?t=r.MoonEvents=function(e,n,t){return n in e?Object.defineProperty(e,n,{value:t,enumerable:!0,configurable:!0,writable:!0}):e[n]=t,e}({},n,e):t[n]=e,r.addEventListener(n.slice(1),function(e){t[n](e)})}else"children"!==n&&!1!==e&&r.setAttribute(n,e)};for(var o in a)t(o);for(var i=a.children,l=0;l<i.length;l++){var u=F(i[l]);r.appendChild(u.element),n.push(u)}}return{element:r,node:e,children:n}}function m(e,n,t){for(;;){var r=e.pop(),a=r.node,o=n.pop();if(a!==o)if(a.name!==o.name)t.push({type:E.replaceNode,nodeOld:r,nodeNew:o,nodeParent:null});else if(a.type===b.text)a.data[""]!==o.data[""]&&t.push({type:E.updateText,nodeOld:r,nodeNew:o,nodeParent:null});else{t.push({type:E.updateData,nodeOld:r,nodeNew:o,nodeParent:null});var i=r.children,l=o.data.children,u=i.length,d=l.length;if(u===d)for(var f=0;f<u;f++)e.push(i[f]),n.push(l[f]);else if(d<u){for(var v=0;v<d;v++)e.push(i[v]),n.push(l[v]);for(var s=d;s<u;s++)t.push({type:E.removeNode,nodeOld:i[s],nodeNew:null,nodeParent:r})}else{for(var p=0;p<u;p++)e.push(i[p]),n.push(l[p]);for(var c=u;c<d;c++)t.push({type:E.appendNode,nodeOld:null,nodeNew:l[c],nodeParent:r})}}if(0===e.length){g(t);break}if(16<=performance.now()-$){requestAnimationFrame(function(){$=performance.now(),m(e,n,t)});break}}}function g(e){for(var n=0;n<e.length;n++){var t=e[n];switch(t.type){case E.updateText:var r=t.nodeOld,a=t.nodeNew;r.element.textContent=a.data[""],r.node=a;break;case E.updateData:var o=t.nodeOld,i=o.node.data,l=o.element,u=t.nodeNew,d=u.data;for(var f in d){var v=d[f];"@"===f[0]?l.MoonEvents[f]=v:"children"!==f&&(!1===v?l.removeAttribute(f):l.setAttribute(f,v))}for(var s in i)s in d||l.removeAttribute(s);o.node=u;break;case E.appendNode:var p=t.nodeParent,c=F(t.nodeNew);p.element.appendChild(c.element),p.children.push(c);break;case E.removeNode:var h=t.nodeParent;h.element.removeChild(h.children.pop().element);break;case E.replaceNode:var m=t.nodeOld,g=m.element,w=F(t.nodeNew),b=w.element;g.parentNode.replaceChild(b,g),m.element=b,m.node=w.node,m.children=w.children}}_.shift(),0!==_.length&&(16<=performance.now()-$?requestAnimationFrame(function(){$=performance.now(),z()}):z())}function z(){var e=_[0];for(var n in e)u[n]=e[n];var t=l(u);h(t),function e(n,t,r){for(;;){var a=n.pop(),o=t.pop(),i=r.pop();a.type===b.component&&(a=p[a.name](a.data),null===o?h(a):o.data.children[i]=a);for(var l=a.data.children,u=0;u<l.length;u++)n.push(l[u]),t.push(a),r.push(u);if(0===n.length){m([d],[s],[]);break}if(16<=performance.now()-$){requestAnimationFrame(function(){$=performance.now(),e(n,t,r)});break}}}([t],[null],[0])}function w(e){_.push(e),1===_.length&&requestAnimationFrame(function(){$=performance.now(),z()})}function e(n){var t=function(e,n){return void 0===e?n:e}(n.name,"Root");delete n.name;var r=n.view;delete n.view,"string"==typeof r&&(r=new Function("m","data",i(r))),c[t]=[];var e=function(e){return r(c[t],function(e,n){var t={};for(var r in e)t[r]=e[r];for(var a in n)a in e||(t[a]=n[a]);return t}(e,n))};if("Root"===t){var a="string"==typeof n.root?document.querySelector(n.root):n.root;delete n.root,function(e){d=e}({element:a,node:{type:b.element,name:a.tagName.toLowerCase(),data:{children:[]}},children:[]}),function(e){l=e}(e),w(n)}else p[t]=e}return e.lex=t,e.parse=a,e.generate=o,e.compile=i,e.components=p,e.get=u,e.set=w,e});
\ No newline at end of file
diff --git a/packages/moon/src/compiler/generator/components/for.js b/packages/moon/src/compiler/generator/components/for.js
index 457db325..2734598d 100644
--- a/packages/moon/src/compiler/generator/components/for.js
+++ b/packages/moon/src/compiler/generator/components/for.js
@@ -11,9 +11,10 @@ import { generateVariable, setGenerateVariable } from "../util/globals";
  */
 export function generateNodeFor(element, staticNodes) {
 	const variable = "m" + generateVariable;
-	const dataLocals = element.attributes[""].split(",");
-	const dataArray = element.attributes.of;
-	const dataObject = element.attributes.in;
+	const attributes = element.attributes;
+	const dataLocals = attributes[""].value.split(",");
+	let dataArray = attributes.of;
+	let dataObject = attributes.in;
 	let dataKey;
 	let dataValue;
 	let prelude;
@@ -31,7 +32,6 @@ export function generateNodeFor(element, staticNodes) {
 	if (generateChild.isStatic) {
 		// If the body is static, then use a static node in place of it.
 		body = `${variable}.push(m[${staticNodes.length}]);`;
-
 		staticNodes.push(generateChild);
 	} else {
 		// If the body is dynamic, then use the dynamic node in the loop body.
@@ -42,7 +42,7 @@ export function generateNodeFor(element, staticNodes) {
 		// Generate a `for` loop over an object. The first local is the key and
 		// the second is the value.
 		let dataObjectValue;
-
+		dataObject = dataObject.value;
 		dataKey = dataLocals[0];
 
 		if (dataLocals.length === 2) {
@@ -56,6 +56,7 @@ export function generateNodeFor(element, staticNodes) {
 	} else {
 		// Generate a `for` loop over an array. The first local is the value and
 		// the second is the key (index).
+		dataArray = dataArray.value;
 		dataKey = dataLocals.length === 2 ? dataLocals[1] : "mi";
 		dataValue = dataLocals[0];
 		prelude = `for(var ${dataKey}=0;${dataKey}<${dataArray}.length;${dataKey}++){var ${dataValue}=${dataArray}[${dataKey}];${body}}`;
diff --git a/packages/moon/src/compiler/generator/components/if.js b/packages/moon/src/compiler/generator/components/if.js
index d6d5c7a0..1edf5f89 100644
--- a/packages/moon/src/compiler/generator/components/if.js
+++ b/packages/moon/src/compiler/generator/components/if.js
@@ -38,13 +38,14 @@ function generateClause(variable, element, staticNodes) {
  */
 export function generateNodeIf(element, parent, index, staticNodes) {
 	const variable = "m" + generateVariable;
+	const attributes = element.attributes;
 	let prelude = "";
 	let emptyElseClause = true;
 
 	setGenerateVariable(generateVariable + 1);
 
 	// Generate the initial `if` clause.
-	prelude += `var ${variable};if(${element.attributes[""]}){${generateClause(variable, element, staticNodes)}}`;
+	prelude += `var ${variable};if(${attributes[""].value}){${generateClause(variable, element, staticNodes)}}`;
 
 	// Search for `else-if` and `else` clauses if there are siblings.
 	if (parent !== null) {
@@ -55,7 +56,7 @@ export function generateNodeIf(element, parent, index, staticNodes) {
 
 			if (sibling.name === "else-if") {
 				// Generate the `else-if` clause.
-				prelude += `else if(${sibling.attributes[""]}){${generateClause(variable, sibling, staticNodes)}}`;
+				prelude += `else if(${attributes[""].value}){${generateClause(variable, sibling, staticNodes)}}`;
 
 				// Remove the `else-if` clause so that it isn't generated
 				// individually by the parent.
diff --git a/packages/moon/src/compiler/generator/generator.js b/packages/moon/src/compiler/generator/generator.js
index 479e0c5f..2e81eb13 100644
--- a/packages/moon/src/compiler/generator/generator.js
+++ b/packages/moon/src/compiler/generator/generator.js
@@ -42,12 +42,12 @@ export function generateNode(element, parent, index, staticNodes) {
 		// attributes.
 		if (
 			attribute[0] === "@" ||
-			(attributeValue[0] !== "\"" && attributeValue[0] !== "'")
+			!attributeValue.isStatic
 		) {
 			isStatic = false;
 		}
 
-		data += `${separator}"${attribute}":${attributeValue}`;
+		data += `${separator}"${attribute}":${attributeValue.value}`;
 		separator = ",";
 	}
 
diff --git a/packages/moon/src/compiler/lexer/lexer.js b/packages/moon/src/compiler/lexer/lexer.js
index 5c15fb5c..66db1ae6 100644
--- a/packages/moon/src/compiler/lexer/lexer.js
+++ b/packages/moon/src/compiler/lexer/lexer.js
@@ -49,16 +49,6 @@ const escapeTextMap = {
 	"\r": "\\r"
 };
 
-/**
- * Checks if a given character is a quote.
- *
- * @param {string} char
- * @returns {boolean} True if the character is a quote
- */
-function isQuote(char) {
-	return char === "\"" || char === "'";
-}
-
 /**
  * Escape text to make it usable in a JavaScript string literal.
  *
@@ -74,15 +64,24 @@ function escapeText(text) {
  * @param {string} expression
  */
 function scopeExpression(expression) {
-	return expression.replace(expressionRE, (match, name) =>
-		(
-			name === undefined ||
-			name[0] === "$" ||
-			globals.indexOf(name) !== -1
-		) ?
-			match :
-			"data." + name
-	);
+	let isStatic = true;
+
+	const value = expression.replace(expressionRE, (match, name) => {
+		if (name === undefined || globals.indexOf(name) !== -1) {
+			// Return a static match if there are no dynamic names or if it is a
+			// global variable.
+			return match;
+		} else {
+			// Return a dynamic match if there is a dynamic name or a local.
+			isStatic = false;
+			return name[0] === "$" ? match : "data." + name;
+		}
+	});
+
+	return {
+		value,
+		isStatic
+	};
 }
 
 /**
@@ -99,10 +98,10 @@ export function tokenString(token) {
 			// If the text content is surrounded with quotes, it was normal text
 			// and doesn't need the quotes. If not, it was an expression and
 			// needs to be formatted with curly braces.
-			if (isQuote(content[0])) {
-				return content.slice(1, -1);
+			if (content.isStatic) {
+				return content.value.slice(1, -1);
 			} else {
-				return `{${content}}`;
+				return `{${content.value}}`;
 			}
 		} else {
 			let tag = "<" + token.value;
@@ -110,7 +109,7 @@ export function tokenString(token) {
 
 			for (let attributeKey in attributes) {
 				const attributeValue = attributes[attributeKey];
-				tag += ` ${attributeKey}=${isQuote(attributeValue[0]) ? attributeValue : `{${attributeValue}}`}`;
+				tag += ` ${attributeKey}=${attributeValue.isStatic ? attributeValue.value : `{${attributeValue.value}}`}`;
 			}
 
 			if (token.closed) {
@@ -184,7 +183,6 @@ export function lex(input) {
 			if (charNext === "/") {
 				// Append a closing tag token if a sequence of characters begins
 				// with "</".
-
 				const closeIndex = input.indexOf(">", i + 2);
 				const name = input.slice(i + 2, closeIndex);
 
@@ -259,16 +257,18 @@ export function lex(input) {
 				} else {
 					// Store the key/value pair using the matched value or
 					// expression.
-					attributes[attributeKey] =
-						attributeExpression === undefined ?
-							attributeValue === undefined ?
-								"\"\"" :
-								attributeValue :
-							scopeExpression(attributeExpression);
+					if (attributeExpression === undefined) {
+						attributes[attributeKey] = {
+							value: attributeValue === undefined ? "\"\"" : attributeValue,
+							isStatic: true
+						};
+					} else {
+						attributes[attributeKey] = scopeExpression(attributeExpression);
+					}
 
 					// Add a wrapper function for events.
 					if (attributeKey[0] === "@") {
-						attributes[attributeKey] = `function($event){${attributes[attributeKey]}}`;
+						attributes[attributeKey].value = `function($event){${attributes[attributeKey].value}}`;
 					}
 				}
 			}
@@ -333,7 +333,10 @@ export function lex(input) {
 					type: "tagOpen",
 					value: "text",
 					attributes: {
-						"": `"${escapeText(text)}"`
+						"": {
+							value: `"${escapeText(text)}"`,
+							isStatic: true
+						}
 					},
 					closed: true
 				});
diff --git a/packages/moon/test/compiler/lexer.test.js b/packages/moon/test/compiler/lexer.test.js
index 9ce1e2fc..0b0c6628 100644
--- a/packages/moon/test/compiler/lexer.test.js
+++ b/packages/moon/test/compiler/lexer.test.js
@@ -13,7 +13,7 @@ test("lex self closing tag", () => {
 });
 
 test("lex text", () => {
-	expect(lex(`text test`)).toEqual([{"attributes": {"": "\"text test\""}, "closed": true, "type": "tagOpen", "value": "text"}]);
+	expect(lex(`text test`)).toEqual([{"attributes": {"": {"value": "\"text test\"", "isStatic": true}}, "closed": true, "type": "tagOpen", "value": "text"}]);
 });
 
 test("lex text inside tag", () => {
@@ -28,7 +28,10 @@ test("lex text inside tag", () => {
 			"type": "tagOpen",
 			"value": "text",
 			"attributes": {
-				"": "\"text\""
+				"": {
+					"value": "\"text\"",
+					"isStatic": true
+				}
 			},
 			"closed": true
 		},
@@ -40,15 +43,15 @@ test("lex text inside tag", () => {
 })
 
 test("lex expression", () => {
-	expect(lex(`{data + 1}`)).toEqual([{"attributes": {"": "data.data + 1"}, "closed": true, "type": "tagOpen", "value": "text"}]);
+	expect(lex(`{data + 1}`)).toEqual([{"attributes": {"": {"value": "data.data + 1", isStatic: false}}, "closed": true, "type": "tagOpen", "value": "text"}]);
 });
 
 test("lex attributes", () => {
-	expect(lex(`<div id="test-id" class='test-class' dynamic={true} self>`)).toEqual([{"attributes": {"id": "\"test-id\"", "class": "'test-class'", dynamic: "true", self: "\"\""}, "closed": false, "type": "tagOpen", "value": "div"}]);
+	expect(lex(`<div id="test-id" class='test-class' dynamic={true} local={$local} self>`)).toEqual([{"attributes": {"id": {"value": "\"test-id\"", "isStatic": true}, "class": {"value": "'test-class'", "isStatic": true}, "dynamic": {"value": "true", "isStatic": true}, "local": {"value": "$local", "isStatic": false}, "self": {"value": "\"\"", "isStatic": true}}, "closed": false, "type": "tagOpen", "value": "div"}]);
 });
 
 test("lex events", () => {
-	expect(lex(`<div id="test-id" class='test-class' dynamic={true} self @event={doSomething()}>`)).toEqual([{"attributes": {"id": "\"test-id\"", "class": "'test-class'", dynamic: "true", "@event": "function($event){data.doSomething()}", self: "\"\""}, "closed": false, "type": "tagOpen", "value": "div"}]);
+	expect(lex(`<div id="test-id" class='test-class' dynamic={true} self @event={doSomething()}>`)).toEqual([{"attributes": {"id": {"value": "\"test-id\"", "isStatic": true}, "class": {"value": "'test-class'", "isStatic": true}, dynamic: {"value": "true", "isStatic": true}, "@event": {"value": "function($event){data.doSomething()}", "isStatic": false}, self: {"value": "\"\"", "isStatic": true}}, "closed": false, "type": "tagOpen", "value": "div"}]);
 });
 
 test("lex comments", () => {
diff --git a/packages/moon/test/compiler/parser.test.js b/packages/moon/test/compiler/parser.test.js
index ef204949..3ff79c36 100644
--- a/packages/moon/test/compiler/parser.test.js
+++ b/packages/moon/test/compiler/parser.test.js
@@ -17,7 +17,10 @@ test("parse text element", () => {
 	expect(parseTest(`test text`)).toEqual({
 		"name": "text",
 		"attributes": {
-			"": `"test text"`
+			"": {
+				value: `"test text"`,
+				isStatic: true
+			}
 		},
 		"children": []
 	});
@@ -32,7 +35,7 @@ test("parse nested elements", () => {
 	`)).toEqual({
 		"name": "div",
 		"attributes": {
-			"dynamic": "true"
+			"dynamic": {"value": "true", "isStatic": true}
 		},
 		"children": [
 			{
@@ -42,7 +45,7 @@ test("parse nested elements", () => {
 					{
 						"name": "text",
 						"attributes": {
-							"": "\"Title\""
+							"": {"value": "\"Title\"", "isStatic": true}
 						},
 						"children": []
 					}
@@ -51,13 +54,13 @@ test("parse nested elements", () => {
 			{
 				"name": "p",
 				"attributes": {
-					"color": "\"blue\""
+					"color": {"value": "\"blue\"", "isStatic": true}
 				},
 				"children": [
 					{
 						"name": "text",
 						"attributes": {
-							"": "\"Text\""
+							"": {"value": "\"Text\"", "isStatic": true}
 						},
 						"children": []
 					}