Much neater NBT handling