Rework how potion effects work; in particular, fix duplicate effects.

Before this, if you (for example) quaff a potion of speed, then quaff
another potion of speed before the first one runs out, you will get an
incorrect message about the effect wearing off when the first one ends,
even though you are still under the effect of the second one.