Simplify some Wand logic. No functional changes.

Trying to figure out why wand inventory changes aren't saving.
Remove single-use wand naming

MAGIC-90 #done #comment this was broken in general, but also doesn't
work for hearts. Will need something more clever or configurable.
Auto-undo Sphere after 20 seconds

Still doesn't work though