FLUID-4637: A test case from KING (not a bug in this case), and some comment and definition cleanup following review