FLUID-5213: Code clean up.