Address Sam's post-landing review of r246234.