More support for items in containers - water now spawns in its bottle, and all messages handle this correctly.