Address review comments, second round.