diff --git a/config/check_macroassembler_style.py b/config/check_macroassembler_style.py
index 0d040a939bfb..ff1e76fd54b2 100644
--- a/config/check_macroassembler_style.py
+++ b/config/check_macroassembler_style.py
@@ -34,9 +34,9 @@ all_architecture_names = set(["x86", "x64", "arm", "arm64"])
 all_shared_architecture_names = set(["x86_shared", "arm", "arm64"])
 
 reBeforeArg = "(?<=[(,\s])"
-reArgType = "(?P<type>[\w\s:*&]+)"
+reArgType = "(?P<type>[\w\s:*&<>]+)"
 reArgName = "(?P<name>\s\w+)"
-reArgDefault = "(?P<default>(?:\s=[^,)]+)?)"
+reArgDefault = "(?P<default>(?:\s=(?:(?:\s[\w:]+\(\))|[^,)]+))?)"
 reAfterArg = "(?=[,)])"
 reMatchArg = re.compile(reBeforeArg + reArgType + reArgName + reArgDefault + reAfterArg)