Updates for codereview comments.