More cleanup, sync ladspa+dssi code