Minor followup to r63425 and r63428