Will do. Waiting for second CR before making pull request.