ENG-4292: Improved formatting.