diff --git a/stepmania/Docs/Lua.xsd b/stepmania/Docs/Lua.xsd
index 150e352c18..0085dc65b2 100644
--- a/stepmania/Docs/Lua.xsd
+++ b/stepmania/Docs/Lua.xsd
@@ -43,6 +43,12 @@
 	</xs:restriction>
 </xs:simpleType>
 
+<xs:simpleType name="IdentifierOrTable">
+	<xs:restriction base="xs:string">
+		<xs:pattern value="[a-zA-Z_][a-zA-Z0-9_]*|\{[a-zA-Z_][a-zA-Z0-9_]*\}" />
+	</xs:restriction>
+</xs:simpleType>
+
 <xs:simpleType name="IdentifierOrNonemptyString">
 	<xs:restriction base="xs:string">
 	<!-- XXX: Doesn't support double quoted strings. -->
@@ -59,11 +65,11 @@
 <xs:simpleType name="ArgumentList">
 	<xs:restriction base="xs:string">
 		<xs:whiteSpace value="collapse" />
-		<xs:pattern value="([a-zA-Z_][a-zA-Z0-9_]* [a-zA-Z_][a-zA-Z0-9_]*( ?, ?[a-zA-Z_][a-zA-Z0-9_]* [a-zA-Z_][a-zA-Z0-9_]*)*)?" />
+		<!-- ((IdentifierOrTable Identifier(, IdentifierOrTable Identifier)*(, ...)?)|...)? -->
+		<xs:pattern value="((([a-zA-Z_][a-zA-Z0-9_]*|\{[a-zA-Z_][a-zA-Z0-9_]*\}) [a-zA-Z_][a-zA-Z0-9_]*( ?, ?([a-zA-Z_][a-zA-Z0-9_]*|\{[a-zA-Z_][a-zA-Z0-9_]*\}) [a-zA-Z_][a-zA-Z0-9_]*)*)( ?, ?\.\.\.)?|\.\.\.)?" />
 	</xs:restriction>
 </xs:simpleType>
 
-
 <xs:complexType name="Singletons">
 	<xs:sequence>
 		<xs:element name="Singleton" minOccurs="0" maxOccurs="unbounded">
@@ -118,7 +124,7 @@
 <xs:complexType name="Function" mixed="true">
 	<xs:group ref="DocumentationGroup" minOccurs="0" maxOccurs="unbounded" />
 	<xs:attribute name="name" type="Identifier" use="required" />
-	<xs:attribute name="return" type="Identifier" use="optional" />
+	<xs:attribute name="return" type="IdentifierOrTable" use="optional" />
 	<xs:attribute name="arguments" type="ArgumentList" use="optional" />
 </xs:complexType>
 
diff --git a/stepmania/Docs/Lua.xsl b/stepmania/Docs/Lua.xsl
index c0f8fc2f7f..95b8ba9df3 100644
--- a/stepmania/Docs/Lua.xsl
+++ b/stepmania/Docs/Lua.xsl
@@ -244,6 +244,14 @@
 <xsl:template name="processType">
 	<xsl:param name="type" />
 	<xsl:choose>
+		<xsl:when test="starts-with($type, '{')">
+			<xsl:text>{</xsl:text>
+			<xsl:call-template name="processType">
+				<xsl:with-param name="type" select="substring-before(
+								     substring-after($type, '{'), '}')" />
+			</xsl:call-template>
+			<xsl:text>}</xsl:text>
+		</xsl:when>
 		<xsl:when test="$type='void' or
 				$type='int' or
 				$type='float' or
@@ -272,7 +280,16 @@
 <xsl:template name="processArguments">
 	<xsl:param name="argumentList" />
 	<xsl:choose>
-		<!-- Base case. -->
+		<xsl:when test="starts-with($argumentList, ' ')">
+			<xsl:call-template name="processArguments">
+				<xsl:with-param name="argumentList"
+						select="substring-after($argumentList, ' ')" />
+			</xsl:call-template>
+		</xsl:when>
+		<!-- Base cases. -->
+		<xsl:when test="$argumentList = '...'">
+			<xsl:text>...</xsl:text>
+		</xsl:when>
 		<xsl:when test="not(contains($argumentList, ','))">
 			<xsl:call-template name="processType">
 				<xsl:with-param name="type"
@@ -282,18 +299,19 @@
 			<xsl:value-of select="substring-after($argumentList, ' ')" />
 		</xsl:when>
 		<xsl:otherwise>
-			<xsl:variable name="before"
+			<xsl:variable name="firstParam"
 				      select="substring-before($argumentList, ',')" />
-			<xsl:variable name="after"
+			<xsl:variable name="restParams"
 			              select="substring-after($argumentList, ',')" />
 			<xsl:call-template name="processType">
 				<xsl:with-param name="type"
-						select="substring-before($before, ' ')" />
+						select="substring-before($firstParam, ' ')" />
 			</xsl:call-template>
-			<xsl:value-of select="substring-after($before, ',')" /><xsl:text>, </xsl:text>
+			<xsl:text> </xsl:text>
+			<xsl:value-of select="substring-after($firstParam, ' ')" /><xsl:text>, </xsl:text>
 			<!-- Recursive call. -->
 			<xsl:call-template name="processArguments">
-				<xsl:with-param name="argumentList" select="$after" />
+				<xsl:with-param name="argumentList" select="$restParams" />
 			</xsl:call-template>
 		</xsl:otherwise>
 	</xsl:choose>