Refactor non-synth plugins also