Alex's review feedback.

Test plan: None