diff --git a/av1/common/reconinter_template.inc b/av1/common/reconinter_template.inc
index 2bcac36..863c13c 100644
--- a/av1/common/reconinter_template.inc
+++ b/av1/common/reconinter_template.inc
@@ -265,4 +265,3 @@
   }
 }
 #endif  // IS_DEC
-#undef RENAME
diff --git a/av1/encoder/reconinter_enc.c b/av1/encoder/reconinter_enc.c
index b8df0ea..ac7dc16 100644
--- a/av1/encoder/reconinter_enc.c
+++ b/av1/encoder/reconinter_enc.c
@@ -53,8 +53,8 @@
 static void enc_build_inter_predictors(const AV1_COMMON *cm, MACROBLOCKD *xd,
                                        int plane, const MB_MODE_INFO *mi,
                                        int bw, int bh, int mi_x, int mi_y) {
-  build_inter_predictors(cm, xd, plane, mi, 0 /* build_for_obmc */, bw, bh,
-                         mi_x, mi_y);
+  build_inter_predictors(cm, xd, plane, mi, /*build_for_obmc=*/0, bw, bh, mi_x,
+                         mi_y);
 }
 
 void av1_enc_build_inter_predictor_y(MACROBLOCKD *xd, int mi_row, int mi_col) {