diff --git a/objectivec/GPBDescriptor.m b/objectivec/GPBDescriptor.m
index 13d26fc..6604201 100644
--- a/objectivec/GPBDescriptor.m
+++ b/objectivec/GPBDescriptor.m
@@ -892,7 +892,7 @@
   const char *nameAsCStr = [name UTF8String];
   nameAsCStr += prefixLen;
 
-  if (nameOffsets_ == NULL) [self calcValueNameOffsets];
+  [self calcValueNameOffsets];
   if (nameOffsets_ == NULL) return NO;
 
   // Find it.
@@ -909,7 +909,7 @@
 }
 
 - (BOOL)getValue:(int32_t *)outValue forEnumTextFormatName:(NSString *)textFormatName {
-  if (nameOffsets_ == NULL) [self calcValueNameOffsets];
+  [self calcValueNameOffsets];
   if (nameOffsets_ == NULL) return NO;
 
   for (uint32_t i = 0; i < valueCount_; ++i) {
@@ -946,7 +946,7 @@
 }
 
 - (NSString *)getEnumNameForIndex:(uint32_t)index {
-  if (nameOffsets_ == NULL) [self calcValueNameOffsets];
+  [self calcValueNameOffsets];
   if (nameOffsets_ == NULL) return nil;
 
   if (index >= valueCount_) {
@@ -958,7 +958,7 @@
 }
 
 - (NSString *)getEnumTextFormatNameForIndex:(uint32_t)index {
-  if (nameOffsets_ == NULL) [self calcValueNameOffsets];
+  [self calcValueNameOffsets];
   if (nameOffsets_ == NULL) return nil;
 
   if (index >= valueCount_) {
diff --git a/src/file_lists.cmake b/src/file_lists.cmake
index bb4114c..e903305 100644
--- a/src/file_lists.cmake
+++ b/src/file_lists.cmake
@@ -1,4 +1,4 @@
-# Auto-generated by @//pkg:gen_src_file_lists_cmake
+# Auto-generated by //pkg:gen_src_file_lists_cmake
 #
 # This file contains lists of sources based on Bazel rules. It should
 # be included from a hand-written CMake file that defines targets.
@@ -9,7 +9,7 @@
   include_guard()
 endif()
 
-# @//pkg:protobuf
+# //pkg:protobuf
 set(libprotobuf_srcs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/any.pb.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/api.pb.cc
@@ -85,7 +85,7 @@
   ${protobuf_SOURCE_DIR}/src/google/protobuf/wire_format_lite.cc
 )
 
-# @//pkg:protobuf
+# //pkg:protobuf
 set(libprotobuf_hdrs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/any.pb.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/api.pb.h
@@ -192,7 +192,7 @@
   ${protobuf_SOURCE_DIR}/src/google/protobuf/wire_format_lite.h
 )
 
-# @//pkg:protobuf_lite
+# //pkg:protobuf_lite
 set(libprotobuf_lite_srcs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/any_lite.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/arena.cc
@@ -220,7 +220,7 @@
   ${protobuf_SOURCE_DIR}/src/google/protobuf/wire_format_lite.cc
 )
 
-# @//pkg:protobuf_lite
+# //pkg:protobuf_lite
 set(libprotobuf_lite_hdrs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/any.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/arena.h
@@ -270,7 +270,7 @@
   ${protobuf_SOURCE_DIR}/src/google/protobuf/wire_format_lite.h
 )
 
-# @//pkg:protoc
+# //pkg:protoc
 set(libprotoc_srcs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/code_generator.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/command_line_interface.cc
@@ -366,7 +366,7 @@
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/zip_writer.cc
 )
 
-# @//pkg:protoc
+# //pkg:protoc
 set(libprotoc_hdrs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/code_generator.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/command_line_interface.h
@@ -388,7 +388,6 @@
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/primitive_field.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/service.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/string_field.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/tracker.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_doc_comment.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_enum.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_enum_field.h
@@ -470,7 +469,7 @@
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/zip_writer.h
 )
 
-# @//src/google/protobuf:well_known_type_protos
+# //src/google/protobuf:well_known_type_protos
 set(wkt_protos_files
   ${protobuf_SOURCE_DIR}/src/google/protobuf/any.proto
   ${protobuf_SOURCE_DIR}/src/google/protobuf/api.proto
@@ -484,68 +483,68 @@
   ${protobuf_SOURCE_DIR}/src/google/protobuf/wrappers.proto
 )
 
-# @//src/google/protobuf:descriptor_proto
+# //src/google/protobuf:descriptor_proto
 set(descriptor_proto_proto_srcs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/descriptor.proto
 )
 
-# @//src/google/protobuf:descriptor_proto
+# //src/google/protobuf:descriptor_proto
 set(descriptor_proto_srcs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/descriptor.proto.pb.cc
 )
 
-# @//src/google/protobuf:descriptor_proto
+# //src/google/protobuf:descriptor_proto
 set(descriptor_proto_hdrs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/descriptor.proto.pb.h
 )
 
-# @//src/google/protobuf:descriptor_proto
+# //src/google/protobuf:descriptor_proto
 set(descriptor_proto_files
   ${protobuf_SOURCE_DIR}/src/google/protobuf/descriptor_proto-descriptor-set.proto.bin
 )
 
-# @//src/google/protobuf/compiler:plugin_proto
+# //src/google/protobuf/compiler:plugin_proto
 set(plugin_proto_proto_srcs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/plugin.proto
 )
 
-# @//src/google/protobuf/compiler:plugin_proto
+# //src/google/protobuf/compiler:plugin_proto
 set(plugin_proto_srcs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/plugin.proto.pb.cc
 )
 
-# @//src/google/protobuf/compiler:plugin_proto
+# //src/google/protobuf/compiler:plugin_proto
 set(plugin_proto_hdrs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/plugin.proto.pb.h
 )
 
-# @//src/google/protobuf/compiler:plugin_proto
+# //src/google/protobuf/compiler:plugin_proto
 set(plugin_proto_files
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/plugin_proto-descriptor-set.proto.bin
 )
 
-# @//pkg:common_test
+# //pkg:common_test
 set(common_test_srcs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/mock_code_generator.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/testing/file.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/testing/googletest.cc
 )
 
-# @//pkg:common_test
+# //pkg:common_test
 set(common_test_hdrs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/mock_code_generator.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/testing/file.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/testing/googletest.h
 )
 
-# @//pkg:lite_test_util
+# //pkg:lite_test_util
 set(lite_test_util_srcs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/arena_test_util.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/map_lite_test_util.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/test_util_lite.cc
 )
 
-# @//pkg:lite_test_util
+# //pkg:lite_test_util
 set(lite_test_util_hdrs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/arena_test_util.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/map_lite_test_util.h
@@ -556,14 +555,14 @@
   ${protobuf_SOURCE_DIR}/src/google/protobuf/test_util_lite.h
 )
 
-# @//pkg:test_util
+# //pkg:test_util
 set(test_util_srcs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/annotation_test_util.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/reflection_tester.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/test_util.cc
 )
 
-# @//pkg:test_util
+# //pkg:test_util
 set(test_util_hdrs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/annotation_test_util.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/unittest.h
@@ -578,7 +577,7 @@
   ${protobuf_SOURCE_DIR}/src/google/protobuf/wire_format_unittest.inc
 )
 
-# @//src/google/protobuf:full_test_srcs
+# //src/google/protobuf:full_test_srcs
 set(protobuf_test_files
   ${protobuf_SOURCE_DIR}/src/google/protobuf/any_test.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/arena_align_test.cc
@@ -610,7 +609,7 @@
   ${protobuf_SOURCE_DIR}/src/google/protobuf/wire_format_unittest.cc
 )
 
-# @//src/google/protobuf:test_proto_srcs
+# //src/google/protobuf:test_proto_srcs
 set(protobuf_test_protos_files
   ${protobuf_SOURCE_DIR}/src/google/protobuf/any_test.proto
   ${protobuf_SOURCE_DIR}/src/google/protobuf/map_proto2_unittest.proto
@@ -643,13 +642,13 @@
   ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_well_known_types.proto
 )
 
-# @//src/google/protobuf:lite_test_srcs
+# //src/google/protobuf:lite_test_srcs
 set(protobuf_lite_test_files
   ${protobuf_SOURCE_DIR}/src/google/protobuf/lite_arena_unittest.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/lite_unittest.cc
 )
 
-# @//src/google/protobuf:lite_test_proto_srcs
+# //src/google/protobuf:lite_test_proto_srcs
 set(protobuf_lite_test_protos_files
   ${protobuf_SOURCE_DIR}/src/google/protobuf/map_lite_unittest.proto
   ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_import_lite.proto
@@ -657,7 +656,7 @@
   ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_lite.proto
 )
 
-# @//src/google/protobuf/compiler:test_srcs
+# //src/google/protobuf/compiler:test_srcs
 set(compiler_test_files
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/command_line_interface_unittest.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/bootstrap_unittest.cc
@@ -680,18 +679,18 @@
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/ruby/ruby_generator_unittest.cc
 )
 
-# @//src/google/protobuf/compiler:test_proto_srcs
+# //src/google/protobuf/compiler:test_proto_srcs
 set(compiler_test_protos_files
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/test_bad_identifiers.proto
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/test_large_enum_value.proto
 )
 
-# @//src/google/protobuf/compiler:test_plugin_srcs
+# //src/google/protobuf/compiler:test_plugin_srcs
 set(test_plugin_files
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/test_plugin.cc
 )
 
-# @//src/google/protobuf/io:test_srcs
+# //src/google/protobuf/io:test_srcs
 set(io_test_files
   ${protobuf_SOURCE_DIR}/src/google/protobuf/io/coded_stream_unittest.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/io/io_win32_unittest.cc
@@ -702,7 +701,7 @@
   ${protobuf_SOURCE_DIR}/src/google/protobuf/io/zero_copy_stream_unittest.cc
 )
 
-# @//src/google/protobuf/util:test_srcs
+# //src/google/protobuf/util:test_srcs
 set(util_test_files
   ${protobuf_SOURCE_DIR}/src/google/protobuf/util/delimited_message_util_test.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/util/field_comparator_test.cc
@@ -712,14 +711,14 @@
   ${protobuf_SOURCE_DIR}/src/google/protobuf/util/type_resolver_util_test.cc
 )
 
-# @//src/google/protobuf/util:test_proto_srcs
+# //src/google/protobuf/util:test_proto_srcs
 set(util_test_protos_files
   ${protobuf_SOURCE_DIR}/src/google/protobuf/util/json_format.proto
   ${protobuf_SOURCE_DIR}/src/google/protobuf/util/json_format_proto3.proto
   ${protobuf_SOURCE_DIR}/src/google/protobuf/util/message_differencer_unittest.proto
 )
 
-# @//src/google/protobuf/stubs:test_srcs
+# //src/google/protobuf/stubs:test_srcs
 set(stubs_test_files
   ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/common_unittest.cc
 )