Applied spigot's Better more flexible itemstack patch.