Address merge comments.