diff --git a/plugins/sounds.sp b/plugins/sounds.sp
index f09b65d8..2ff2c93d 100644
--- a/plugins/sounds.sp
+++ b/plugins/sounds.sp
@@ -35,7 +35,7 @@
 
 #include <sourcemod>
 
-public Plugin:myinfo =
+public Plugin myinfo =
 {
 	name = "Sound Commands",
 	author = "AlliedModders LLC",
@@ -44,7 +44,7 @@ public Plugin:myinfo =
 	url = "http://www.sourcemod.net/"
 };
 
-public OnPluginStart( )
+public void OnPluginStart()
 {
 	LoadTranslations("common.phrases");
 	LoadTranslations("sounds.phrases");
@@ -52,7 +52,7 @@ public OnPluginStart( )
 	RegAdminCmd("sm_play", Command_Play, ADMFLAG_GENERIC, "sm_play <#userid|name> <filename>");
 }
 
-public Action:Command_Play(client, args)
+public Action Command_Play(int client, int args)
 {
 	if (args < 2)
 	{
@@ -60,11 +60,11 @@ public Action:Command_Play(client, args)
 		return Plugin_Handled;
 	}
 
-	new String:Arguments[PLATFORM_MAX_PATH + 65];
+	char Arguments[PLATFORM_MAX_PATH + 65];
 	GetCmdArgString(Arguments, sizeof(Arguments));
 
- 	decl String:Arg[65];
-	new len = BreakString(Arguments, Arg, sizeof(Arg));
+ 	char Arg[65];
+	int len = BreakString(Arguments, Arg, sizeof(Arg));
 
 	/* Make sure it does not go out of bound by doing "sm_play user  "*/
 	if (len == -1)
@@ -77,7 +77,7 @@ public Action:Command_Play(client, args)
 	if (Arguments[len] == '"')
 	{
 		len++;
-		new FileLen = TrimString(Arguments[len]) + len;
+		int FileLen = TrimString(Arguments[len]) + len;
 
 		if (Arguments[FileLen - 1] == '"')
 		{
@@ -85,8 +85,9 @@ public Action:Command_Play(client, args)
 		}
 	}
 	
-	decl String:target_name[MAX_TARGET_LENGTH];
-	decl target_list[MAXPLAYERS], target_count, bool:tn_is_ml;
+	char target_name[MAX_TARGET_LENGTH];
+	char target_list[MAXPLAYERS], target_count;
+	bool tn_is_ml;
 	
 	if ((target_count = ProcessTargetString(
 			Arg,
@@ -102,7 +103,7 @@ public Action:Command_Play(client, args)
 		return Plugin_Handled;
 	}
 	
-	for (new i = 0; i < target_count; i++)
+	for (int i = 0; i < target_count; i++)
 	{
 		ClientCommand(target_list[i], "playgamesound \"%s\"", Arguments[len]);
 		LogAction(client, target_list[i], "\"%L\" played sound on \"%L\" (file \"%s\")", client, target_list[i], Arguments[len]);
diff --git a/sourcepawn/compiler/sc1.c b/sourcepawn/compiler/sc1.c
index fe2fa2c2..52fbeb8e 100644
--- a/sourcepawn/compiler/sc1.c
+++ b/sourcepawn/compiler/sc1.c
@@ -3361,6 +3361,8 @@ static int reparse_new_decl(declinfo_t *decl, int flags)
     decl->type.numdim = 0;
     decl->type.size = 0;
     decl->type.enumroot = NULL;
+    decl->type.ident = iVARIABLE;
+    decl->type.size = 0;
     decl->has_postdims = FALSE;
     if (matchtoken('['))
       parse_old_array_dims(decl, flags);
@@ -6461,6 +6463,28 @@ static void statement(int *lastindent,int allow_decl)
     *lastindent=stmtindent;
     indent_nowarn=FALSE;        /* if warning was blocked, re-enable it */
   } /* if */
+
+  if (tok == tSYMBOL) {
+    // We reaaaally don't have enough lookahead for this, so we cheat and try
+    // to determine whether this is probably a declaration.
+    int is_decl = FALSE;
+    if (matchtoken('[')) {
+      if (lexpeek(']'))
+        is_decl = TRUE;
+      lexpush();
+    } else if (lexpeek(tSYMBOL)) {
+      is_decl = TRUE;
+    }
+
+    if (is_decl) {
+      lexpush();
+      autozero = TRUE;
+      lastst = tNEW;
+      declloc(tNEW);
+      return;
+    }
+  }
+
   switch (tok) {
   case 0:
     /* nothing */
diff --git a/sourcepawn/compiler/sc2.c b/sourcepawn/compiler/sc2.c
index 32d3fa19..33eb0629 100644
--- a/sourcepawn/compiler/sc2.c
+++ b/sourcepawn/compiler/sc2.c
@@ -2319,10 +2319,6 @@ SC_FUNC int matchtoken(int token)
  */
 SC_FUNC int tokeninfo(cell *val,char **str)
 {
-  /* if the token was pushed back, tokeninfo() returns the token and
-   * parameters of the *next* token, not of the *current* token.
-   */
-  assert(sTokenBuffer->depth == 0);
   *val = current_token()->value;
   *str = current_token()->str;
   return current_token()->id;