Add comments from Eric's review of r204094.