Right. But I have modified this part to address other of the comments in commit 843768c9c0907b127e7f139496580b94e92cac54.