[DF-5024] Code style fixes after review.