clean up 6cc2812f2e8 (interim vst fixes)