Minor cleanup including followup to b=577727. r=tbsaunde