Replace tap add charge with effect based syntax
Change SimpleMayChoice to use PlusOne counters, not charge
Merge