FLUID-4853: More code improvements based on the code review feedback.