Maybe move the second sentence in my comment on line 3746 here.