FLUID-5205, FLUID-5216: Code clean-up, improved comments, updates to reflect fix to FLUID-5190.