Follow-ups from r63682 CR suggestions.