[fixup] Review nits