Yeah, if we go with this version, I will absolutely fix that. I also need to document the fact that keys will still have a default type set, etc.