diff --git a/Libraries/RCTTest/RCTTestModule.m b/Libraries/RCTTest/RCTTestModule.m
index 54c44513e3..9ef60c6117 100644
--- a/Libraries/RCTTest/RCTTestModule.m
+++ b/Libraries/RCTTest/RCTTestModule.m
@@ -55,7 +55,7 @@ RCT_EXPORT_METHOD(verifySnapshot:(RCTResponseSenderBlock)callback)
   }];
 }
 
-RCT_EXPORT_METHOD(sendAppEvent:(NSString *)name body:(id)body)
+RCT_EXPORT_METHOD(sendAppEvent:(NSString *)name body:(nullable id)body)
 {
   [_bridge.eventDispatcher sendAppEventWithName:name body:body];
 }
diff --git a/React/Base/RCTModuleMethod.m b/React/Base/RCTModuleMethod.m
index aca8267b94..f294085e2f 100644
--- a/React/Base/RCTModuleMethod.m
+++ b/React/Base/RCTModuleMethod.m
@@ -40,10 +40,12 @@
     static NSRegularExpression *typeRegex;
     static NSRegularExpression *selectorRegex;
     if (!typeRegex) {
-      NSString *unusedPattern = @"(?:(?:__unused|__attribute__\\(\\(unused\\)\\)))";
+      NSString *unusedPattern = @"(?:__unused|__attribute__\\(\\(unused\\)\\))";
       NSString *constPattern = @"(?:const)";
-      NSString *constUnusedPattern = [NSString stringWithFormat:@"(?:(?:%@|%@)\\s*)", unusedPattern, constPattern];
-      NSString *pattern = [NSString stringWithFormat:@"\\(%1$@?(\\w+?)(?:\\s*\\*)?%1$@?\\)", constUnusedPattern];
+      NSString *nullabilityPattern = @"(?:__nullable|__nonnull|nullable|nonnull)";
+      NSString *annotationPattern = [NSString stringWithFormat:@"(?:(?:%@|%@|%@)\\s*)",
+                                     unusedPattern, constPattern, nullabilityPattern];
+      NSString *pattern = [NSString stringWithFormat:@"\\(%1$@?(\\w+?)(?:\\s*\\*)?%1$@?\\)", annotationPattern];
       typeRegex = [[NSRegularExpression alloc] initWithPattern:pattern options:0 error:NULL];
 
       selectorRegex = [[NSRegularExpression alloc] initWithPattern:@"(?<=:).*?(?=[a-zA-Z_]+:|$)" options:0 error:NULL];