FLUID-5126: Fix for "three on a match" listener corruption with repeated demands blocks

... demands blocks