Rework the ItemPotion property, fixes #693

I realize half of this is inside the previous commit... git loves
messing with me.
Anyway, potions now work perfectly :D