Fix outstanding nits from previous merge.