Fix test failures caused by vec4-stack merge.