More stencilOpSeparate fixes