Minor followup to r64197