If I were you, I'd do as you already are doing, and leave the predicated (Unused) definitions around but just mostly move the demo to not include the tags but instead the normal parameters in the plugin.
