Address various code review comments.