diff --git a/src/Latte/PhpWriter.php b/src/Latte/PhpWriter.php
index 42af7de1d..96596a2e7 100644
--- a/src/Latte/PhpWriter.php
+++ b/src/Latte/PhpWriter.php
@@ -76,9 +76,9 @@ function($m) use ($me, $word, & $args) {
 				case 'word':
 					$code = $me->formatWord($arg); break;
 				case 'args':
-					$code = $me->formatArgs(); break; // TODO: only as node.args
+					$code = $me->formatArgs(); break;
 				case 'array':
-					$code = $me->formatArray(); // TODO: only as node.array
+					$code = $me->formatArray();
 					$code = $cond && $code === 'array()' ? '' : $code; break;
 				case 'var':
 					$code = var_export($arg, TRUE); break;
diff --git a/src/Latte/Tokenizer.php b/src/Latte/Tokenizer.php
index 01d0d4693..3efbe7cc5 100644
--- a/src/Latte/Tokenizer.php
+++ b/src/Latte/Tokenizer.php
@@ -47,7 +47,7 @@ public function tokenize($input)
 	{
 		preg_match_all($this->re, $input, $tokens, PREG_SET_ORDER);
 		if (preg_last_error()) {
-			throw new Latte\RegexpException(NULL, preg_last_error());
+			throw new RegexpException(NULL, preg_last_error());
 		}
 		$len = 0;
 		$count = count($this->types);