Fix empty field creation for data kinds without type.

When checking for exhaustion of available kind types (introduced by
commit 6c3c5890), make sure to do that
check only for data kinds that actually have a type attached.

Change-Id: I7fb69faaf46802faae8ac4e90633627e04d5ee22