oops; nuke unused var
improve vq:fold test
by placing some messages in q1
merge default into bug25397