Second commit after reviewer comments.