FLUID-4826: Code clean-up.