LOCSERVICES-4350 Minor style changes following code review.