Remove extra trinket/ring slots, just use one.

We'll see if this sticks. It's going to make life a lot easier, and I
don't think it sacrifices too much (and might gain a lot)