Various updates for code review feedback.